Fixed: Manual declarations of wrappers in proper common interfaces

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

5 files changed, 0 insertions, 55 deletions

diff --git a/make/gl-es1.cfg b/make/gl-es1.cfg
index c19b05b98..0329e64d4 100755
--- a/make/gl-es1.cfg
+++ b/make/gl-es1.cfg
@@ -41,19 +41,15 @@ LocalProcAddressCallingConvention __ALL__ GL_APIENTRY
 # Pick up on-line OpenGL javadoc thanks to user cylab on javagaming.org forums
 TagNativeBinding true
 
-CustomJavaCode GLES1      public void glOrtho(double left, double right, double bottom, double top, double near_val, double far_val);
 CustomJavaCode GLES1Impl  public void glOrtho(double left, double right, double bottom, double top, double near_val, double far_val) {
 CustomJavaCode GLES1Impl    glOrtho((float) left, (float) right, (float) bottom, (float) top, (float) near_val, (float) far_val); }
                 
-CustomJavaCode GLES1      public void glFrustum(double left, double right, double bottom, double top, double zNear, double zFar);
 CustomJavaCode GLES1Impl  public void glFrustum(double left, double right, double bottom, double top, double zNear, double zFar) {
 CustomJavaCode GLES1Impl    glFrustumf((float) left, (float) right, (float) bottom, (float) top, (float) zNear, (float) zFar); }
                 
-CustomJavaCode GLES1      public void glClearDepth(double depth);
 CustomJavaCode GLES1Impl  public void glClearDepth(double depth) {
 CustomJavaCode GLES1Impl   glClearDepthf((float)depth); }
 
-CustomJavaCode GLES1      public void glDepthRange(double zNear, double zFar);
 CustomJavaCode GLES1Impl  public void glDepthRange(double zNear, double zFar) {
 CustomJavaCode GLES1Impl   glDepthRangef((float)zNear, (float)zFar); }
 
diff --git a/make/gl-es2.cfg b/make/gl-es2.cfg
index feeb7d1ca..cdf936ba9 100755
--- a/make/gl-es2.cfg
+++ b/make/gl-es2.cfg
@@ -39,11 +39,9 @@ LocalProcAddressCallingConvention __ALL__ GL_APIENTRY
 # Pick up on-line OpenGL javadoc thanks to user cylab on javagaming.org forums
 TagNativeBinding true
 
-CustomJavaCode GLES2     public void glClearDepth(double depth);
 CustomJavaCode GLES2Impl public void glClearDepth(double depth) {
 CustomJavaCode GLES2Impl   glClearDepthf((float)depth); }
 
-CustomJavaCode GLES2     public void glDepthRange(double zNear, double zFar);
 CustomJavaCode GLES2Impl public void glDepthRange(double zNear, double zFar) {
 CustomJavaCode GLES2Impl   glDepthRangef((float)zNear, (float)zFar); }
 
@@ -57,19 +55,6 @@ CustomCCode #include <GLES2/gl2ext.h>
 CustomCCode #include <stdlib.h>
 Include intptr.cfg
 
-CustomJavaCode GLES2  public void glShaderSource(int shader, java.lang.String[] source);
-CustomJavaCode GLES2  public void glShaderSource(IntBuffer shaders, java.lang.String[][] sources);
-CustomJavaCode GLES2  public void glShaderBinary(IntBuffer shaders, int binFormat, java.nio.Buffer bin);
-CustomJavaCode GLES2  /**
-CustomJavaCode GLES2   * Wrapper for glShaderBinary and glShaderSource.
-CustomJavaCode GLES2   * Tries binary first, if not null, then the source code, if not null.
-CustomJavaCode GLES2   * The binary trial will fail in case no binary interface exist (GL2 profile),
-CustomJavaCode GLES2   * hence the fallback to the source code.
-CustomJavaCode GLES2   */
-CustomJavaCode GLES2  public void glShaderBinaryOrSource(IntBuffer shaders, 
-CustomJavaCode GLES2                                     int binFormat, java.nio.Buffer bin,
-CustomJavaCode GLES2                                     java.lang.String[][] sources);
-
 IncludeAs CustomJavaCode GLES2Impl gl-impl-CustomJavaCode-common.java
 IncludeAs CustomJavaCode GLES2Impl gl-impl-CustomJavaCode-gles2.java
 IncludeAs CustomJavaCode GLES2Impl gl-impl-CustomJavaCode-gl2_es2.java
diff --git a/make/gl-gl2.cfg b/make/gl-gl2.cfg
index fb137b458..6fdfb54cd 100644
--- a/make/gl-gl2.cfg
+++ b/make/gl-gl2.cfg
@@ -37,38 +37,21 @@ CustomJavaCode GL2     public static final int GL_STENCIL_INDEX16 = 0x8D49;
 CustomJavaCode GL2     public static final int GL_RGBA_FLOAT32_APPLE = 0x8814;
 CustomJavaCode GL2     public static final int GL_RGBA_FLOAT16_APPLE = 0x881A;
 
-CustomJavaCode GL2     public void glFrustumf(float left, float right, float bottom, float top, float zNear, float zFar);
 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 GL2     public void glOrthof(float left, float right, float bottom, float top, float zNear, float 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 GL2     public void glClearDepthf(float depth);
 CustomJavaCode GL2Impl public void glClearDepthf(float depth) {
 CustomJavaCode GL2Impl   glClearDepth((double)depth); }
 
-CustomJavaCode GL2     public void glDepthRangef(float zNear, float zFar);
 CustomJavaCode GL2Impl public void glDepthRangef(float zNear, float zFar) {
 CustomJavaCode GL2Impl    glDepthRange((double)zNear, (double)zFar); }
 
 Include gl-headers.cfg
 Include intptr.cfg
 
-CustomJavaCode GL2  public void glShaderSource(int shader, java.lang.String[] source);
-CustomJavaCode GL2  public void glShaderSource(IntBuffer shaders, java.lang.String[][] sources);
-CustomJavaCode GL2  public void glShaderBinary(IntBuffer shaders, int binFormat, java.nio.Buffer bin);
-CustomJavaCode GL2  /**
-CustomJavaCode GL2   * Wrapper for glShaderBinary and glShaderSource.
-CustomJavaCode GL2   * Tries binary first, if not null, then the source code, if not null.
-CustomJavaCode GL2   * The binary trial will fail in case no binary interface exist (GL2 profile),
-CustomJavaCode GL2   * hence the fallback to the source code.
-CustomJavaCode GL2   */
-CustomJavaCode GL2  public void glShaderBinaryOrSource(IntBuffer shaders, 
-CustomJavaCode GL2                                     int binFormat, java.nio.Buffer bin,
-CustomJavaCode GL2                                     java.lang.String[][] sources);
-
 IncludeAs CustomJavaCode GL2Impl gl-impl-CustomJavaCode-common.java
 IncludeAs CustomJavaCode GL2Impl gl-impl-CustomJavaCode-gl2.java
 IncludeAs CustomJavaCode GL2Impl gl-impl-CustomJavaCode-gl2_es2.java
diff --git a/make/gl-gl2es12.cfg b/make/gl-gl2es12.cfg
index 1f80fa7a1..8bd3d7f4d 100644
--- a/make/gl-gl2es12.cfg
+++ b/make/gl-gl2es12.cfg
@@ -33,38 +33,21 @@ 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 GL2ES12     public void glFrustumf(float left, float right, float bottom, float top, float zNear, float zFar);
 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 GL2ES12     public void glOrthof(float left, float right, float bottom, float top, float zNear, float 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 GL2ES12     public void glClearDepthf(float depth);
 CustomJavaCode GL2ES12Impl public void glClearDepthf(float depth) {
 CustomJavaCode GL2ES12Impl   glClearDepth((double)depth); }
 
-CustomJavaCode GL2ES12     public void glDepthRangef(float zNear, float zFar);
 CustomJavaCode GL2ES12Impl public void glDepthRangef(float zNear, float zFar) {
 CustomJavaCode GL2ES12Impl    glDepthRange((double)zNear, (double)zFar); }
 
 Include gl-headers.cfg
 Include intptr.cfg
 
-CustomJavaCode GL2ES12  public void glShaderSource(int shader, java.lang.String[] source);
-CustomJavaCode GL2ES12  public void glShaderSource(IntBuffer shaders, java.lang.String[][] sources);
-CustomJavaCode GL2ES12  public void glShaderBinary(IntBuffer shaders, int binFormat, java.nio.Buffer bin);
-CustomJavaCode GL2ES12  /**
-CustomJavaCode GL2ES12   * Wrapper for glShaderBinary and glShaderSource.
-CustomJavaCode GL2ES12   * Tries binary first, if not null, then the source code, if not null.
-CustomJavaCode GL2ES12   * The binary trial will fail in case no binary interface exist (GL2 profile),
-CustomJavaCode GL2ES12   * hence the fallback to the source code.
-CustomJavaCode GL2ES12   */
-CustomJavaCode GL2ES12  public void glShaderBinaryOrSource(IntBuffer shaders, 
-CustomJavaCode GL2ES12                                     int binFormat, java.nio.Buffer bin,
-CustomJavaCode GL2ES12                                     java.lang.String[][] sources);
-
 IncludeAs CustomJavaCode GL2ES12Impl gl-impl-CustomJavaCode-common.java
 IncludeAs CustomJavaCode GL2ES12Impl gl-impl-CustomJavaCode-gl2es12.java
 IncludeAs CustomJavaCode GL2ES12Impl gl-impl-CustomJavaCode-gl2_es2.java
diff --git a/make/gl-if-gl2_es1.cfg b/make/gl-if-gl2_es1.cfg
index ada1314fa..0d477a275 100755
--- a/make/gl-if-gl2_es1.cfg
+++ b/make/gl-if-gl2_es1.cfg
@@ -59,8 +59,6 @@ Ignore glGetFixedv
 
 CustomJavaCode GL2ES1 public void glOrtho(double left, double right, double bottom, double top, double near_val, double far_val);
 CustomJavaCode GL2ES1 public void glFrustum(double left, double right, double bottom, double top, double zNear, double zFar);
-CustomJavaCode GL2ES1 public void glClearDepth( double depth );
-CustomJavaCode GL2ES1 public void glDepthRange(double zNear, double zFar);
 
 EmitProcAddressTable false
 ProcAddressTableClassName DontGenerateProcAddressTableStuff