412f38f270
This adds a static OpenGL ES API. Here are the three commit messages for the original changes: Clean up trivial Eclipse warnings and fix whitespace. Added @Override to overridden methods. Removed unused imports. Converted tabs to spaces. Removed \r characters from end-of-lines. Add .gitignore file to ignore the .class files that are generated when the "gen" script is run. This is the 2nd commit message: Improve glgen + gen script is really a bash script rather than a sh script, so declare that to be true. (For example, it uses pushd, which is a part of bash, but not a part of sh. Not sure how this worked until now. Possibly gen was only run in environments where /bin/sh was really bash. + Check the results of the java compile of the code generator, and abort the script if the compile fails. + Turn on the bash shell option that guards against using uninitialized variables in the script. + Remove the generated class files. Refactor JniCodeEmitter into two classes: a general-purpose JniCodeEmitter and a specific Jsr239CodeEmitter. The hope is to use JniCodeEmitter as a base for emitting static OpenGL ES bindings. This is the 3rd commit message: Add an Android-specific static OpenGL ES 1.1 Java API. This change adds four new public classes that expose a static OpenGL ES 1.1 API: android.opengl.GLES10 android.opengl.GLES10Ext android.opengl.GLES11 android.opengl.GLES11Ext Benefits: + The static API is slightly faster (1% to 4%) than the existing Interface based JSR239 API. + The static API is similar to the C API, which should make it easier to import C-based example code. + The static API provides a clear path for adding new OpenGL ES 1.1 extensions and OpenGL ES 2.0 APIs, neither of which currently have a JSR standard. Example: import static android.opengl.GLES10.*; ... glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); Note that it is possible to mix-and-match calls to both the static and JSR239 APIs. This works because neither API maintains state. They both call through to the same underlying C OpenGL ES APIs. Implementation details: This change enhances the "glgen" "gen" script to generate both the original JSR239 and new static OpenGL ES APIs. The contents of the generated JSR239 classes remained the same as before, so there is no need to check in new versions of the generated JSR239 classes. As part of this work the gen script was updated to be somewhat more robust, and to work with git instead of perforce. The script prints out commands to git add the generated files, but leaves it up to the script runner to actually execute those commands.
104 lines
3.3 KiB
Bash
Executable File
104 lines
3.3 KiB
Bash
Executable File
#!/bin/bash
|
|
set -u
|
|
set -e
|
|
rm -rf out generated
|
|
|
|
mkdir out
|
|
mkdir -p out/javax/microedition/khronos/opengles
|
|
mkdir -p out/com/google/android/gles_jni
|
|
mkdir -p out/android/graphics
|
|
mkdir -p out/android/opengl
|
|
|
|
echo "package android.graphics;" > out/android/graphics/Canvas.java
|
|
echo "public interface Canvas {}" >> out/android/graphics/Canvas.java
|
|
|
|
GLFILE=out/javax/microedition/khronos/opengles/GL.java
|
|
cp stubs/jsr239/GLHeader.java-if $GLFILE
|
|
|
|
GLGEN_FILES="CFunc.java CType.java CodeEmitter.java GenerateGL.java GenerateGLES.java GLESCodeEmitter.java JFunc.java JniCodeEmitter.java JType.java Jsr239CodeEmitter.java ParameterChecker.java"
|
|
|
|
pushd src > /dev/null
|
|
javac ${GLGEN_FILES}
|
|
JAVAC_RESULT=$?
|
|
if [ $JAVAC_RESULT -ne 0 ]; then
|
|
echo "Could not compile glgen."
|
|
exit $JAVAC_RESULT
|
|
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_RESULT=$?
|
|
if [ $JAVA_RESULT -ne 0 ]; then
|
|
echo "Could not run GenerateGL."
|
|
exit $JAVA_RESULT
|
|
fi
|
|
|
|
echo "Generating static OpenGLES 1.1 bindings"
|
|
java -classpath src GenerateGLES
|
|
JAVA_RESULT=$?
|
|
if [ $JAVA_RESULT -ne 0 ]; then
|
|
echo "Could not run GenerateGLES."
|
|
exit $JAVA_RESULT
|
|
fi
|
|
|
|
rm src/*.class
|
|
|
|
pushd out > /dev/null
|
|
mkdir classes
|
|
javac -d classes 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
|
|
popd > /dev/null
|
|
JAVA_RESULT=$?
|
|
if [ $JAVA_RESULT -ne 0 ]; then
|
|
echo "Could not compile generated classes."
|
|
exit $JAVA_RESULT
|
|
fi
|
|
|
|
rm -rf generated
|
|
mkdir -p generated/C
|
|
cp out/com_google_android_gles_jni_GLImpl.cpp generated/C
|
|
cp -r out/com generated
|
|
cp -r out/javax generated
|
|
|
|
cp out/android_opengl_*.cpp generated/C
|
|
mkdir -p generated/android/opengl
|
|
cp -r out/android/opengl generated/android
|
|
|
|
rm -rf out
|
|
KEEP_GENERATED=0
|
|
SAID_PLEASE=0
|
|
|
|
# compareGenerated destDir generatedDir file
|
|
compareGenerated() {
|
|
if cmp -s $1/$3 $2/$3 ; then
|
|
echo "# " $3 unchanged
|
|
else
|
|
if [ $SAID_PLEASE == "0" ] ; then
|
|
echo Please evaluate the following commands:
|
|
echo
|
|
SAID_PLEASE=1
|
|
fi
|
|
echo " " cp $2/$3 $1
|
|
echo " " git add $1/$3
|
|
KEEP_GENERATED=1
|
|
fi
|
|
}
|
|
|
|
compareGenerated ../../../core/jni generated/C com_google_android_gles_jni_GLImpl.cpp
|
|
compareGenerated ../../java/com/google/android/gles_jni generated/com/google/android/gles_jni GLImpl.java
|
|
|
|
for x in GL.java GL10.java GL10Ext.java GL11.java GL11Ext.java GL11ExtensionPack.java
|
|
do
|
|
compareGenerated ../../java/javax/microedition/khronos/opengles generated/javax/microedition/khronos/opengles $x
|
|
done
|
|
|
|
for x in GLES10 GLES10Ext GLES11 GLES11Ext
|
|
do
|
|
compareGenerated ../../java/android/opengl generated/android/opengl ${x}.java
|
|
compareGenerated ../../../core/jni generated/C android_opengl_${x}.cpp
|
|
done
|
|
|
|
if [ $KEEP_GENERATED == "0" ] ; then
|
|
rm -rf generated
|
|
fi
|