summaryrefslogtreecommitdiffstats
path: root/opengl/tools/glgen/gen
diff options
context:
space:
mode:
Diffstat (limited to 'opengl/tools/glgen/gen')
-rwxr-xr-xopengl/tools/glgen/gen30
1 files changed, 24 insertions, 6 deletions
diff --git a/opengl/tools/glgen/gen b/opengl/tools/glgen/gen
index 3359a22..d236c1e 100755
--- a/opengl/tools/glgen/gen
+++ b/opengl/tools/glgen/gen
@@ -27,7 +27,7 @@ echo "package android.app; import android.content.pm.IPackageManager; public cla
echo "package android.content.pm; public class ApplicationInfo {public int targetSdkVersion;}" > out/android/content/pm/ApplicationInfo.java
echo "package android.content.pm; public interface IPackageManager {ApplicationInfo getApplicationInfo(java.lang.String packageName, int flags, java.lang.String userId) throws android.os.RemoteException;}" > out/android/content/pm/IPackageManager.java
echo "package android.os; public class Build {public static class VERSION_CODES { public static final int CUPCAKE = 3;}; }" > out/android/os/Build.java
-echo "package android.os; public class UserId {public static String myUserId() { return \"\"; } }" > out/android/os/UserId.java
+echo "package android.os; public class UserHandle {public static String myUserId() { return \"\"; } }" > out/android/os/UserHandle.java
echo "package android.os; public class RemoteException extends Exception {}" > out/android/os/RemoteException.java
echo "package android.util; public class Log {public static void w(String a, String b) {} public static void e(String a, String b) {}}" > out/android/util/Log.java
@@ -63,14 +63,19 @@ fi
popd > /dev/null
echo "Generating JSR239-like APIs"
-java -classpath src GenerateGL -c specs/jsr239/glspec-1.0 specs/jsr239/glspec-1.0ext specs/jsr239/glspec-1.1 specs/jsr239/glspec-1.1ext specs/jsr239/glspec-1.1extpack specs/jsr239/glspec-checks
+java -classpath src GenerateGL -c specs/jsr239/glspec-1.0 \
+ specs/jsr239/glspec-1.0ext \
+ specs/jsr239/glspec-1.1 \
+ specs/jsr239/glspec-1.1ext \
+ specs/jsr239/glspec-1.1extpack \
+ specs/jsr239/glspec-checks
JAVA_RESULT=$?
if [ $JAVA_RESULT -ne 0 ]; then
echo "Could not run GenerateGL."
exit $JAVA_RESULT
fi
-echo "Generating static OpenGLES 1.1 bindings"
+echo "Generating static OpenGLES bindings"
java -classpath src GenerateGLES
JAVA_RESULT=$?
if [ $JAVA_RESULT -ne 0 ]; then
@@ -78,7 +83,7 @@ if [ $JAVA_RESULT -ne 0 ]; then
exit $JAVA_RESULT
fi
-echo "Generating static EGL 1.4 bindings"
+echo "Generating static EGL bindings"
java -classpath src GenerateEGL
JAVA_RESULT=$?
if [ $JAVA_RESULT -ne 0 ]; then
@@ -90,7 +95,20 @@ rm src/*.class
pushd out > /dev/null
mkdir classes
-javac -d classes android/opengl/EGL14.java com/google/android/gles_jni/GLImpl.java javax/microedition/khronos/opengles/GL10.java javax/microedition/khronos/opengles/GL10Ext.java javax/microedition/khronos/opengles/GL11.java javax/microedition/khronos/opengles/GL11Ext.java javax/microedition/khronos/opengles/GL11ExtensionPack.java android/opengl/GLES10.java android/opengl/GLES10Ext.java android/opengl/GLES11.java android/opengl/GLES11Ext.java android/opengl/GLES20.java
+javac -d classes android/opengl/EGL14.java \
+ android/opengl/EGLExt.java \
+ com/google/android/gles_jni/GLImpl.java \
+ javax/microedition/khronos/opengles/GL10.java \
+ javax/microedition/khronos/opengles/GL10Ext.java \
+ javax/microedition/khronos/opengles/GL11.java \
+ javax/microedition/khronos/opengles/GL11Ext.java \
+ javax/microedition/khronos/opengles/GL11ExtensionPack.java \
+ android/opengl/GLES10.java \
+ android/opengl/GLES10Ext.java \
+ android/opengl/GLES11.java \
+ android/opengl/GLES11Ext.java \
+ android/opengl/GLES20.java \
+ android/opengl/GLES30.java
popd > /dev/null
JAVA_RESULT=$?
if [ $JAVA_RESULT -ne 0 ]; then
@@ -137,7 +155,7 @@ do
compareGenerated ../../../../base/opengl/java/javax/microedition/khronos/opengles generated/javax/microedition/khronos/opengles $x
done
-for x in EGL14 GLES10 GLES10Ext GLES11 GLES11Ext GLES20
+for x in EGL14 EGLExt GLES10 GLES10Ext GLES11 GLES11Ext GLES20 GLES30
do
compareGenerated ../../../../base/opengl/java/android/opengl generated/android/opengl ${x}.java
compareGenerated ../../../../base/core/jni generated/C android_opengl_${x}.cpp