Unify GL: glUnmapBuffer, glBlend*, glGenerateMipmap; Analyze script for collisions: lsGL23_commons.shOpenGL_3_2_Integrated

6 files changed, 46 insertions, 42 deletions

diff --git a/make/config/jogl/gl-if-gl-ignores.cfg b/make/config/jogl/gl-if-gl-ignores.cfg
index 1fa439702..5deb828e6 100644
--- a/make/config/jogl/gl-if-gl-ignores.cfg
+++ b/make/config/jogl/gl-if-gl-ignores.cfg
@@ -354,7 +354,7 @@ Ignore GL_WRITE_ONLY_OES
 Ignore GL_XOR
 Ignore glIsProgram
 Ignore glIsShader
-Ignore glUnmapBufferOES
+#Ignore glUnmapBufferOES
 Ignore glCreateProgram
 Ignore glCreateShader
 Ignore glGetAttribLocation
@@ -363,12 +363,12 @@ Ignore glAlphaFunc
 Ignore glAttachShader
 Ignore glBindAttribLocation
 Ignore glBlendColor
-Ignore glBlendEquation
-Ignore glBlendEquationOES
-Ignore glBlendEquationSeparate
-Ignore glBlendEquationSeparateOES
-Ignore glBlendFuncSeparate
-Ignore glBlendFuncSeparateOES
+#Ignore glBlendEquation
+#Ignore glBlendEquationOES
+#Ignore glBlendEquationSeparate
+#Ignore glBlendEquationSeparateOES
+#Ignore glBlendFuncSeparate
+#Ignore glBlendFuncSeparateOES
 Ignore glClearDepthfOES
 Ignore glClientActiveTexture
 Ignore glClipPlanef
@@ -401,8 +401,8 @@ Ignore glFogxvOES
 Ignore glFramebufferVertexAttribArrayNV
 Ignore glFrustumf
 Ignore glFrustumfOES
-Ignore glGenerateMipmap
-Ignore glGenerateMipmapOES
+#Ignore glGenerateMipmap
+#Ignore glGenerateMipmapOES
 Ignore glGetActiveAttrib
 Ignore glGetActiveUniform
 Ignore glGetAttachedShaders
diff --git a/make/lsGL23_commons.sh b/make/lsGL23_commons.sh
new file mode 100644
index 000000000..7c7161717
--- /dev/null
+++ b/make/lsGL23_commons.sh
@@ -0,0 +1,18 @@
+#! /bin/sh
+
+BUILDDIR=$1
+shift
+if [ -z "$BUILDDIR" ] ; then
+    echo "usage $0 <BUILDDIR>"
+    exit 1
+fi
+
+idir=$BUILDDIR/jogl/gensrc/classes/javax/media/opengl
+
+SOURCE="$idir/GL.java $idir/GL2ES1.java $idir/GL2ES2.java $idir/GLES1.java $idir/GLES2.java $idir/GL2GL3.java $idir/GL2.java $idir/GL3.java"
+
+echo GL GL2ES1 GL2ES2 GLES1 GLES2 GL2GL3 GL2 GL3 defines
+sort $SOURCE | uniq -d | grep GL_ | grep -v "Part of <code>"
+
+echo GL GL2ES1 GL2ES2 GLES1 GLES2 GL2GL3 GL2 GL3 functions
+sort $SOURCE | uniq -d | grep "public [a-z0-9_]* gl"
diff --git a/make/lsGL23_unique.sh b/make/lsGL23_unique.sh
new file mode 100644
index 000000000..e21112ecc
--- /dev/null
+++ b/make/lsGL23_unique.sh
@@ -0,0 +1,18 @@
+#! /bin/sh
+
+BUILDDIR=$1
+shift
+if [ -z "$BUILDDIR" ] ; then
+    echo "usage $0 <BUILDDIR>"
+    exit 1
+fi
+
+idir=$BUILDDIR/jogl/gensrc/classes/javax/media/opengl
+
+SOURCE="$idir/GL.java $idir/GLES2.java $idir/GL2ES2.java $idir/GL3.java $idir/GL2.java $idir/GL2GL3.java"
+
+echo GL2GL3 to GL2 GL3 Gl2ES2 GLES2 GL defines
+sort $SOURCE | uniq -u | grep GL_ | grep -v "Part of <code>" | awk ' { print $5 } '
+
+echo GL2GL3 to GL2 GL3 Gl2ES2 GLES2 GL functions
+sort $SOURCE | uniq -u | grep "public [a-z0-9_]* gl"
diff --git a/make/lsGL23toGL2ES1_commons.sh b/make/lsGL23toGL2ES1_commons.sh
index b91edb794..83a543b3c 100644
--- a/make/lsGL23toGL2ES1_commons.sh
+++ b/make/lsGL23toGL2ES1_commons.sh
@@ -11,7 +11,7 @@ idir=$BUILDDIR/jogl/gensrc/classes/javax/media/opengl
 
 echo GL2GL3 to GL2ES1 enums
 # sort $idir/GL2.java $idir/GL3.java $idir/GL2ES1.java $idir/GL2GL3.java | uniq -d | grep GL_ | awk ' { print $5 } '
-sort $idir/GL2.java $idir/GL3.java $idir/GL2ES1.java $idir/GL2GL3.java | uniq -d | grep GL_ 
+sort $idir/GL2.java $idir/GL3.java $idir/GL2ES1.java $idir/GL2GL3.java | uniq -d | grep GL_ | grep -v "Part of <code>"
 
 echo GL2GL3 to GL2ES1 functions
 # sort $idir/GL2.java $idir/GL3.java $idir/GL2ES1.java $idir/GL2GL3.java | uniq -d | grep "public [a-z0-9_]* gl"
diff --git a/make/lsGL2toGL3_commons.sh b/make/lsGL2toGL3_commons.sh
deleted file mode 100644
index 7f2a276de..000000000
--- a/make/lsGL2toGL3_commons.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#! /bin/sh
-
-BUILDDIR=$1
-shift
-if [ -z "$BUILDDIR" ] ; then
-    echo "usage $0 <BUILDDIR>"
-    exit 1
-fi
-
-idir=$BUILDDIR/jogl/gensrc/classes/javax/media/opengl
-
-echo GL2 to GL3 enums
-sort $idir/GL2.java $idir/GL3.java $idir/GL2ES2.java $idir/GL2GL3.java | uniq -d | grep GL_ | awk ' { print $5 } '
-
-echo GL2 to GL3 functions
-sort $idir/GL2.java $idir/GL3.java $idir/GL2ES2.java $idir/GL2GL3.java | uniq -d | grep "public [a-z0-9_]* gl"
diff --git a/make/lsGL2toGL3_unique.sh b/make/lsGL2toGL3_unique.sh
deleted file mode 100644
index 20d821332..000000000
--- a/make/lsGL2toGL3_unique.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#! /bin/sh
-
-BUILDDIR=$1
-shift
-if [ -z "$BUILDDIR" ] ; then
-    echo "usage $0 <BUILDDIR>"
-    exit 1
-fi
-
-idir=$BUILDDIR/jogl/gensrc/classes/javax/media/opengl
-
-echo GL2 to GL3 enums
-sort $idir/GL2.java $idir/GL3.java $idir/GL2ES2.java $idir/GL2GL3.java | uniq -u | grep GL_ | awk ' { print $5 } '
-
-echo GL2 to GL3 functions
-sort $idir/GL2.java $idir/GL3.java $idir/GL2ES2.java $idir/GL2GL3.java | uniq -u | grep "public [a-z0-9_]* gl"