Enable static Java APIs for OpenGL ES 1.1 extensions.

This is just plumbing. The Java APIs existed already, but there were no C APIs to hook the Java APIs
up to. Now there are C APIs, so we can call them.

Of course, whether or not the C APIs actually work when you call them depend upon the
capabilities of the active OpenGL driver, which must be checked at run time.

Also, while we're here, make the glGetString method static. It was always supposed to be static,
but was accidentally implemented as non-static, because the code was copied from the non-static
OpenGL ES classes.

4 files changed, 3 insertions, 109 deletions

diff --git a/opengl/java/android/opengl/GLES10.java b/opengl/java/android/opengl/GLES10.java
index e597d12..147b60f 100644
--- a/opengl/java/android/opengl/GLES10.java
+++ b/opengl/java/android/opengl/GLES10.java
@@ -671,20 +671,9 @@ public class GLES10 {
 
     // C function const GLubyte * glGetString ( GLenum name )
 
-    public native String _glGetString(
+    public static native String glGetString(
         int name
     );
-
-    public String glGetString(
-        int name
-    ) {
-        String returnValue;
-        returnValue = _glGetString(
-            name
-        );
-        return returnValue;
-    }
-
     // C function void glHint ( GLenum target, GLenum mode )
 
     public static native void glHint(
diff --git a/opengl/tools/glgen/specs/gles11/checks.spec b/opengl/tools/glgen/specs/gles11/checks.spec
index 9ff1205..97dac2e 100644
--- a/opengl/tools/glgen/specs/gles11/checks.spec
+++ b/opengl/tools/glgen/specs/gles11/checks.spec
@@ -59,87 +59,3 @@ glTexGenf unsupported
 glTexGeni unsupported

 glTexGenx unsupported

 glWeightPointerOES unsupported

-// Lots of unsupported

-glAlphaFuncxOES unsupported

-glBlendEquationOES unsupported

-glBlendEquationSeparateOES unsupported

-glBlendFuncSeparateOES unsupported

-glClearColorxOES unsupported

-glClearDepthfOES unsupported

-glClearDepthxOES unsupported

-glClipPlanefOES unsupported

-glClipPlanefOES unsupported

-glClipPlanexOES unsupported

-glClipPlanexOES unsupported

-glColor4xOES unsupported

-glDepthRangefOES unsupported

-glDepthRangexOES unsupported

-glEGLImageTargetRenderbufferStorageOES unsupported

-glEGLImageTargetTexture2DOES unsupported

-glFogxOES unsupported

-glFogxvOES unsupported

-glFogxvOES unsupported

-glFrustumfOES unsupported

-glFrustumxOES unsupported

-glGetClipPlanefOES unsupported

-glGetClipPlanefOES unsupported

-glGetClipPlanexOES unsupported

-glGetClipPlanexOES unsupported

-glGetFixedvOES unsupported

-glGetFixedvOES unsupported

-glGetLightxvOES unsupported

-glGetLightxvOES unsupported

-glGetMaterialxvOES unsupported

-glGetMaterialxvOES unsupported

-glGetTexEnvxvOES unsupported

-glGetTexEnvxvOES unsupported

-glGetTexGenfvOES unsupported

-glGetTexGenfvOES unsupported

-glGetTexGenivOES unsupported

-glGetTexGenivOES unsupported

-glGetTexGenxvOES unsupported

-glGetTexGenxvOES unsupported

-glGetTexParameterxvOES unsupported

-glGetTexParameterxvOES unsupported

-glLightModelxOES unsupported

-glLightModelxvOES unsupported

-glLightModelxvOES unsupported

-glLightxOES unsupported

-glLightxvOES unsupported

-glLightxvOES unsupported

-glLineWidthxOES unsupported

-glLoadMatrixxOES unsupported

-glLoadMatrixxOES unsupported

-glMaterialxOES unsupported

-glMaterialxvOES unsupported

-glMaterialxvOES unsupported

-glMultMatrixxOES unsupported

-glMultMatrixxOES unsupported

-glMultiTexCoord4xOES unsupported

-glNormal3xOES unsupported

-glOrthofOES unsupported

-glOrthoxOES unsupported

-glPointParameterxOES unsupported

-glPointParameterxvOES unsupported

-glPointParameterxvOES unsupported

-glPointSizexOES unsupported

-glPolygonOffsetxOES unsupported

-glRotatexOES unsupported

-glSampleCoveragexOES unsupported

-glScalexOES unsupported

-glTexEnvxOES unsupported

-glTexEnvxvOES unsupported

-glTexEnvxvOES unsupported

-glTexGenfOES unsupported

-glTexGenfvOES unsupported

-glTexGenfvOES unsupported

-glTexGeniOES unsupported

-glTexGenivOES unsupported

-glTexGenivOES unsupported

-glTexGenxOES unsupported

-glTexGenxvOES unsupported

-glTexGenxvOES unsupported

-glTexParameterxOES unsupported

-glTexParameterxvOES unsupported

-glTexParameterxvOES unsupported

-glTranslatexOES unsupported
\ No newline at end of file
diff --git a/opengl/tools/glgen/stubs/gles11/glGetString.java b/opengl/tools/glgen/stubs/gles11/glGetString.java
index 8c7881c..fba249b 100644
--- a/opengl/tools/glgen/stubs/gles11/glGetString.java
+++ b/opengl/tools/glgen/stubs/gles11/glGetString.java
@@ -1,16 +1,5 @@
     // C function const GLubyte * glGetString ( GLenum name )

 

-    public native String _glGetString(

+    public static native String glGetString(

         int name

     );

-

-    public String glGetString(

-        int name

-    ) {

-        String returnValue;

-        returnValue = _glGetString(

-            name

-        );

-        return returnValue;

-    }

-

diff --git a/opengl/tools/glgen/stubs/gles11/glGetString.nativeReg b/opengl/tools/glgen/stubs/gles11/glGetString.nativeReg
index e64187c..a4af31f 100644
--- a/opengl/tools/glgen/stubs/gles11/glGetString.nativeReg
+++ b/opengl/tools/glgen/stubs/gles11/glGetString.nativeReg
@@ -1 +1 @@
-{"_glGetString", "(I)Ljava/lang/String;", (void *) android_glGetString },

+{"glGetString", "(I)Ljava/lang/String;", (void *) android_glGetString },