Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 883daf6e authored by Jesse Hall's avatar Jesse Hall Committed by Android (Google) Code Review
Browse files

Merge "Make gen more readable, use UNIX-style line endings" into jb-mr2-dev

parents 48be3232 a3b641e8

opengl/tools/glgen/gen

+18 −2
Original line number Diff line number Diff line
@@ -63,7 +63,12 @@ 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."
@@ -90,7 +95,18 @@ 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 \

                    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

popd > /dev/null

JAVA_RESULT=$?

if [ $JAVA_RESULT -ne 0 ]; then

opengl/tools/glgen/specs/gles11/GLES20.spec

+144 −144

File changed.

Contains only whitespace changes.