Removed GL2ES12 interface from the public API since it is only an

implementation detail. Removed GL2ES12 queries from the GLProfile
class. Changed GL2ES12 instance to pay attention to the chosen profile
so it behaves only like either GL2ES1 or GL2ES2. Sven's fixed function
emulation can now be tested on the desktop without needing OpenGL ES
emulation libraries. However, there appear to be problems running it
on top of Apple's OpenGL implementation -- seen by running
demos.es1.RedSquare and demos.es1.angeles.Main forcing the use of the
GL2ES2 profile.


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

4 files changed, 40 insertions, 38 deletions

diff --git a/make/config/jogl/gl-gl2es12.cfg b/make/config/jogl/gl-gl2es12.cfg
index 6d1b34bcf..74103066a 100644
--- a/make/config/jogl/gl-gl2es12.cfg
+++ b/make/config/jogl/gl-gl2es12.cfg
@@ -2,24 +2,15 @@
 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
-
-Package javax.media.opengl
-Style InterfaceAndImpl
-JavaClass GL2ES12
-Extends GL2ES12 GL
-Extends GL2ES12 GL2ES1
-Extends GL2ES12 GL2ES2
-Extends GL2ES12 GLBase
-Extends GL2ES12 GLMatrixFunc
-Extends GL2ES12 GLPointerFunc
-Extends GL2ES12 GLLightingFunc
+ExtendedInterfaceSymbols ../build-temp/gensrc/classes/javax/media/opengl/GL.java
+ExtendedInterfaceSymbols ../build-temp/gensrc/classes/javax/media/opengl/GL2ES1.java
+ExtendedInterfaceSymbols ../build-temp/gensrc/classes/javax/media/opengl/GL2ES2.java
+ExtendedInterfaceSymbols ../src/jogl/classes/javax/media/opengl/GLBase.java
+ExtendedInterfaceSymbols ../src/jogl/classes/javax/media/opengl/fixedfunc/GLMatrixFunc.java
+ExtendedInterfaceSymbols ../src/jogl/classes/javax/media/opengl/fixedfunc/GLPointerFunc.java
+ExtendedInterfaceSymbols ../src/jogl/classes/javax/media/opengl/fixedfunc/GLLightingFunc.java
+
+Style ImplOnly
 ImplPackage com.sun.opengl.impl.gl2es12
 ImplJavaClass GL2ES12Impl
 Implements GL2ES12Impl GL
@@ -34,6 +25,11 @@ Include gl-common-gl2.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
+
 EmitProcAddressTable true
 ProcAddressTableClassName GL2ES12ProcAddressTable
 GetProcAddressTableExpr ((GL2ES12ProcAddressTable)_context.getGLProcAddressTable())
@@ -41,10 +37,6 @@ GetProcAddressTableExpr ((GL2ES12ProcAddressTable)_context.getGLProcAddressTable
 # Pick up on-line OpenGL javadoc thanks to user cylab on javagaming.org forums
 TagNativeBinding true
 
-CustomJavaCode GL2ES12     public static final int GL_STENCIL_INDEX16 = 0x8D49;
-CustomJavaCode GL2ES12     public static final int GL_RGBA_FLOAT32_APPLE = 0x8814;
-CustomJavaCode GL2ES12     public static final int GL_RGBA_FLOAT16_APPLE = 0x881A;
-
 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); }
 
@@ -67,6 +59,5 @@ IncludeAs CustomCCode gl-impl-CustomCCode-gl2es12.c
 
 Import javax.media.opengl.GLES1
 Import javax.media.opengl.GLES2
-Import javax.media.opengl.GL2ES12
 Import com.sun.opengl.impl.InternalBufferUtil
 Import java.io.PrintStream
diff --git a/make/config/jogl/gl-impl-CustomJavaCode-gl2_es2.java b/make/config/jogl/gl-impl-CustomJavaCode-gl2_es2.java
index 0575eb1a2..37b19ec8a 100644
--- a/make/config/jogl/gl-impl-CustomJavaCode-gl2_es2.java
+++ b/make/config/jogl/gl-impl-CustomJavaCode-gl2_es2.java
@@ -295,17 +295,19 @@
   public final String toString() {
       StringBuffer buf = new StringBuffer();
       buf.append(getClass().getName());
-      buf.append(" [GLSL compiler: ");
-      buf.append(glShaderCompilerAvailable());
-      Set bfs = glGetShaderBinaryFormats();
-      buf.append(", binary formats ");
-      buf.append(bfs.size());
-      buf.append(":");
-      for(Iterator iter=bfs.iterator(); iter.hasNext(); ) {
-          buf.append(" ");
-          buf.append(((Integer)(iter.next())).intValue());
+      if (isGL2ES2()) {
+          buf.append(" [GLSL compiler: ");
+          buf.append(glShaderCompilerAvailable());
+          Set bfs = glGetShaderBinaryFormats();
+          buf.append(", binary formats ");
+          buf.append(bfs.size());
+          buf.append(":");
+          for(Iterator iter=bfs.iterator(); iter.hasNext(); ) {
+              buf.append(" ");
+              buf.append(((Integer)(iter.next())).intValue());
+          }
+          buf.append("]");
       }
-      buf.append("]");
       return buf.toString();
   }
 
diff --git a/make/config/jogl/gl-impl-CustomJavaCode-gl2es12.java b/make/config/jogl/gl-impl-CustomJavaCode-gl2es12.java
index 4668bd7ff..560124a99 100644
--- a/make/config/jogl/gl-impl-CustomJavaCode-gl2es12.java
+++ b/make/config/jogl/gl-impl-CustomJavaCode-gl2es12.java
@@ -18,8 +18,11 @@ public void setObjectTracker(GLObjectTracker tracker) {
 public GL2ES12Impl(GLContextImpl context) {
   this._context = context; 
   this.bufferSizeTracker = context.getBufferSizeTracker();
+  this.isGL2ES2 = GLProfile.isGL2ES2();
 }
 
+private boolean isGL2ES2;
+
 public final boolean isGL() {
     return false;
 }
@@ -41,11 +44,11 @@ public final boolean isGLES() {
 }
 
 public final boolean isGL2ES1() {
-    return true;
+    return !isGL2ES2;
 }
 
 public final boolean isGL2ES2() {
-    return true;
+    return isGL2ES2;
 }
 
 public final GL getGL() throws GLException {
@@ -65,11 +68,17 @@ public final GLES2 getGLES2() throws GLException {
 }
 
 public final GL2ES1 getGL2ES1() throws GLException {
-    return this;
+    if (isGL2ES1()) {
+        return this;
+    }
+    throw new GLException("Not a GL2ES1 implementation");
 }
 
 public final GL2ES2 getGL2ES2() throws GLException {
-    return this;
+    if (isGL2ES2()) {
+        return this;
+    }
+    throw new GLException("Not a GL2ES2 implementation");
 }
 
 public boolean isFunctionAvailable(String glFunctionName) {
diff --git a/make/config/jogl/glu-CustomJavaCode-base.java b/make/config/jogl/glu-CustomJavaCode-base.java
index 94a859ba5..5b8a30f46 100755
--- a/make/config/jogl/glu-CustomJavaCode-base.java
+++ b/make/config/jogl/glu-CustomJavaCode-base.java
@@ -93,7 +93,7 @@ public static final GLU createGLU(String profile) throws GLException {
       } 
   } catch (GLException e) { e.printStackTrace(); }
   try {
-      if(GLProfile.GL2ES12.equals(profile) || GLProfile.GL2.equals(profile) || GLProfile.GLES1.equals(profile)) {
+      if(GLProfile.GL2ES1.equals(profile) || GLProfile.GL2.equals(profile) || GLProfile.GLES1.equals(profile)) {
         return (GLU) NWReflection.createInstance("javax.media.opengl.glu.gl2es1.GLUgl2es1");
       } 
   } catch (GLException e) { e.printStackTrace(); }