10 files changed, 60 insertions, 13 deletions
diff --git a/make/gl-common.cfg b/make/gl-common.cfg
index 362d27bb5..2d30216f1 100644
--- a/make/gl-common.cfg
+++ b/make/gl-common.cfg
@@ -269,6 +269,7 @@ JavaEpilogue glBindBuffer       bufferStateTracker.setBoundBufferObject({0}, {1}
 JavaEpilogue glBindBufferARB    bufferStateTracker.setBoundBufferObject({0}, {1});
 JavaEpilogue glPushClientAttrib bufferStateTracker.clearBufferObjectState();
 JavaEpilogue glPopClientAttrib  bufferStateTracker.clearBufferObjectState();
+JavaEpilogue glBufferData       bufferSizeTracker.setBufferSize(bufferStateTracker, {0}, this, {1});
 
 BufferObjectKind Array glColorPointer
 BufferObjectKind Array glEdgeFlagPointer
diff --git a/make/gl-desktop.cfg b/make/gl-desktop.cfg
index 16996b913..4281ddd80 100755
--- a/make/gl-desktop.cfg
+++ b/make/gl-desktop.cfg
@@ -37,7 +37,7 @@ BufferObjectKind UnpackPixel glTexSubImage1D
 BufferObjectKind UnpackPixel glTexSubImage2D
 BufferObjectKind UnpackPixel glTexSubImage3D
 
-BufferObjectKind PackPixel  glGetColorTable
+BufferObjectKind PackPixel glGetColorTable
 BufferObjectKind PackPixel glGetCompressedTexImage
 BufferObjectKind PackPixel glGetCompressedTexImageARB
 BufferObjectKind PackPixel glGetConvolutionFilter
@@ -110,7 +110,3 @@ TemporaryCVariableDeclaration glXGetFBConfigs       int count;
 TemporaryCVariableAssignment  glXGetFBConfigs       count = _ptr2[0];
 ReturnValueLength             glXGetFBConfigs       count
 
-# Right now the implementations for these don't work on the embedded
-# OpenGL variants (FIXME)
-JavaEpilogue glBufferData       bufferSizeTracker.setBufferSize(bufferStateTracker, {0}, this, {1});
-JavaEpilogue glBufferDataARB    bufferSizeTracker.setBufferSize(bufferStateTracker, {0}, this, {1});
diff --git a/make/gl-if-gl2_es1.cfg b/make/gl-if-gl2_es1.cfg
index b4d450def..0d3e6a453 100755
--- a/make/gl-if-gl2_es1.cfg
+++ b/make/gl-if-gl2_es1.cfg
@@ -14,16 +14,46 @@ NativeOutputDir ../build/gensrc/native/jogl
 # Ignore all ES 1.X only stuff to GL2
 Ignore glPointSizePointer
 Ignore glGetFixedv
-Ignore glDrawTex.*
+Ignore ^glDrawTex.*
 
 #heavy float/double array diff to GL2
 Ignore glClipPlanef
-Ignore glGetClipPlanef(OES)?
+Ignore ^glGetClipPlanef(OES)?
 
 #impl diff
-Ignore ^gl.*x(v)?(OES)?
+Ignore ^glEGL.*
+Ignore ^gl.*(xv)(OES)?
+Ignore glAlphaFuncx
+Ignore glClearColorx
+Ignore glClearDepthx
+Ignore glClipPlanex
+Ignore glColor4x
+Ignore glDepthRangex
+Ignore glFogx
+Ignore glFrustumx
+Ignore glGetClipPlanex
+Ignore glLightModelx
+Ignore glLightx
+Ignore glLineWidthx
+Ignore glLoadMatrixx
+Ignore glMaterialx
+Ignore glMultMatrixx
+Ignore glMultiTexCoord4x
+Ignore glNormal3x
+Ignore glOrthox
+Ignore glPointParameterx
+Ignore glPointSizex
+Ignore glPolygonOffsetx
+Ignore glQueryMatrixx
+Ignore glRotatex
+Ignore glSampleCoveragex
+Ignore glScalex
+Ignore glTexEnvx
+Ignore glTexGenx
+Ignore glTexParameterx
+Ignore glTranslatex
+Ignore glLoadPaletteFromModelViewMatrix
 Ignore glGetFixedv
-Ignore glEGL.*
 
 CustomJavaCode GL2ES1 public void glClearDepth( double depth );
 CustomJavaCode GL2ES1 public void glDepthRange(double zNear, double zFar);
diff --git a/make/gl-if-gl2_es2.cfg b/make/gl-if-gl2_es2.cfg
index b5b738d6f..c96c3739f 100755
--- a/make/gl-if-gl2_es2.cfg
+++ b/make/gl-if-gl2_es2.cfg
@@ -12,7 +12,7 @@ JavaOutputDir ../build/gensrc/classes
 NativeOutputDir ../build/gensrc/native/jogl
 
 # Ignore all ES 2.X only stuff ..
-Ignore ^gl.*x(v)?(OES)?
+# Ignore ^gl.*x(v)?(OES)?
 Ignore glShaderBinary
 Ignore glReleaseShaderCompiler
 Ignore glGetShaderPrecisionFormat
diff --git a/make/gl-ignore-gl2_es12-special.cfg b/make/gl-ignore-gl2_es12-special.cfg
index af9b2c117..4d673e66e 100644
--- a/make/gl-ignore-gl2_es12-special.cfg
+++ b/make/gl-ignore-gl2_es12-special.cfg
@@ -87,6 +87,7 @@ Ignore GL_ETC1_RGB8_OES
 Ignore GL_EXP
 Ignore GL_EXP2
 Ignore GL_FIXED_OES
+Ignore GL_FIXED
 Ignore GL_FLAT
 Ignore GL_FLOAT_MAT2
 Ignore GL_FLOAT_MAT3
diff --git a/make/gl-impl-CustomJavaCode-gl2.java b/make/gl-impl-CustomJavaCode-gl2.java
index a0be170da..f002d6082 100644
--- a/make/gl-impl-CustomJavaCode-gl2.java
+++ b/make/gl-impl-CustomJavaCode-gl2.java
@@ -17,7 +17,7 @@ public void setObjectTracker(GLObjectTracker tracker) {
 
 public GL2Impl(GLContextImpl context) {
   this._context = context; 
-  this.bufferSizeTracker = context.getBufferSizeTracker();
+  this.bufferSizeTracker = context.getOrCreateBufferSizeTracker();
 }
 
 public boolean isFunctionAvailable(String glFunctionName) {
diff --git a/make/gl-impl-CustomJavaCode-gles1.java b/make/gl-impl-CustomJavaCode-gles1.java
index 4a59b039c..e47dc80e4 100755
--- a/make/gl-impl-CustomJavaCode-gles1.java
+++ b/make/gl-impl-CustomJavaCode-gles1.java
@@ -4,7 +4,7 @@ private boolean inBeginEndPair;
 
 public GLES1Impl(GLContextImpl context) {
   this._context = context; 
-  this.bufferSizeTracker = context.getBufferSizeTracker();
+  this.bufferSizeTracker = context.getOrCreateBufferSizeTracker();
 }
 
 public boolean isFunctionAvailable(String glFunctionName) {
diff --git a/make/gl-impl-CustomJavaCode-gles2.java b/make/gl-impl-CustomJavaCode-gles2.java
index e9f0a1dd1..c267fc4bf 100755
--- a/make/gl-impl-CustomJavaCode-gles2.java
+++ b/make/gl-impl-CustomJavaCode-gles2.java
@@ -4,7 +4,7 @@ private boolean inBeginEndPair;
 
 public GLES2Impl(GLContextImpl context) {
   this._context = context; 
-  this.bufferSizeTracker = context.getBufferSizeTracker();
+  this.bufferSizeTracker = context.getOrCreateBufferSizeTracker();
 }
 
 public boolean isFunctionAvailable(String glFunctionName) {
diff --git a/make/glu-CustomJavaCode-gl2.java b/make/glu-CustomJavaCode-gl2.java
index 9eedf6395..d6f18a7db 100644
--- a/make/glu-CustomJavaCode-gl2.java
+++ b/make/glu-CustomJavaCode-gl2.java
@@ -990,14 +990,27 @@ public final void gluSphere(GLUquadric quad, double radius, int slices, int stac
 
 private ProjectDouble project;
 
+public final void gluOrtho2D(float left, float right, float bottom, float top) {
+  project.gluOrtho2D(getCurrentGL2(), (double)left, (double)right, (double)bottom, (double)top);
+
+}
+
 public final void gluOrtho2D(double left, double right, double bottom, double top) {
   project.gluOrtho2D(getCurrentGL2(), left, right, bottom, top);
 }
 
+public final void gluPerspective(float fovy, float aspect, float zNear, float zFar) {
+  project.gluPerspective(getCurrentGL2(), (double)fovy, (double)aspect, (double)zNear, (double)zFar);
+}
+
 public final void gluPerspective(double fovy, double aspect, double zNear, double zFar) {
   project.gluPerspective(getCurrentGL2(), fovy, aspect, zNear, zFar);
 }
 
+public final void gluLookAt(float eyeX, float eyeY, float eyeZ, float centerX, float centerY, float centerZ, float upX, float upY, float upZ) {
+  project.gluLookAt(getCurrentGL2(), (double)eyeX, (double)eyeY, (double)eyeZ, (double)centerX, (double)centerY, (double)centerZ, (double)upX, (double)upY, (double)upZ);
+}
+
 public final void gluLookAt(double eyeX, double eyeY, double eyeZ, double centerX, double centerY, double centerZ, double upX, double upY, double upZ) {
   project.gluLookAt(getCurrentGL2(), eyeX, eyeY, eyeZ, centerX, centerY, centerZ, upX, upY, upZ);
 }
diff --git a/make/glu-CustomJavaCode-gles1_if.java b/make/glu-CustomJavaCode-gles1_if.java
index bb9f3d54d..ac140edcf 100755
--- a/make/glu-CustomJavaCode-gles1_if.java
+++ b/make/glu-CustomJavaCode-gles1_if.java
@@ -331,10 +331,16 @@ public abstract void gluQuadricTexture(GLUquadric quad, boolean texture) ;
 /** Interface to C language function: <br> <code> void gluSphere(GLUquadric *  quad, GLdouble radius, GLint slices, GLint stacks); </code>    */
 public abstract void gluSphere(GLUquadric quad, double radius, int slices, int stacks) ;
 
+public abstract void gluOrtho2D(float left, float right, float bottom, float top) ;
+
 public abstract void gluOrtho2D(double left, double right, double bottom, double top) ;
 
+public abstract void gluPerspective(float fovy, float aspect, float zNear, float zFar) ;
+
 public abstract void gluPerspective(double fovy, double aspect, double zNear, double zFar) ;
 
+public abstract void gluLookAt(float eyeX, float eyeY, float eyeZ, float centerX, float centerY, float centerZ, float upX, float upY, float upZ) ;
+
 public abstract void gluLookAt(double eyeX, double eyeY, double eyeZ, double centerX, double centerY, double centerZ, double upX, double upY, double upZ) ;
 
 /** Interface to C language function: <br> <code> GLint gluProject(GLdouble objX, GLdouble objY, GLdouble objZ, const GLdouble *  model, const GLdouble *  proj, const GLint *  view, GLdouble *  winX, GLdouble *  winY, GLdouble *  winZ); </code>