Bug 1135 - Change all GlueGen config files, supporting EGL 1.5 , ES 3.1 and GL 4.5

2 files changed, 343 insertions, 9 deletions

diff --git a/make/scripts/gluegen-gl.sh b/make/scripts/gluegen-gl.sh
index 2d40ddcd9..d337689ca 100644
--- a/make/scripts/gluegen-gl.sh
+++ b/make/scripts/gluegen-gl.sh
@@ -1,6 +1,7 @@
 #! /bin/bash
 
-rootrel=build-x86_64
+#rootrel=build-x86_64
+rootrel=build-x86_64-clang
 
 builddir=../$rootrel
 buildtmp=../build-temp
@@ -10,6 +11,26 @@ function copy_temp() {
     cp -a $builddir/jogl/gensrc/classes/* $buildtmp/gensrc/classes/
 }
 
+function gluegen_jawt_x11() {
+java \
+-classpath \
+../../gluegen/$rootrel/gluegen.jar:../$rootrel/jogl/gluegen-gl.jar \
+com.jogamp.gluegen.GlueGen \
+--debug \
+-O../$rootrel/nativewindow \
+-Ecom.jogamp.gluegen.JavaEmitter \
+-C./config/nativewindow/jawt-x11.cfg \
+-Istub_includes/khr \
+-Istub_includes/khr/KD \
+-Istub_includes/khr/KHR \
+-Istub_includes/x11 \
+-Istub_includes/x11/X11 \
+-Istub_includes/x11/X11/extensions \
+-I../../gluegen/make/stub_includes/gluegen \
+-Istub_includes/jni \
+stub_includes/jni/x11/jawt_md.h
+}
+
 function gluegen_if_gl() {
 java \
 -classpath \
@@ -192,6 +213,84 @@ copy_temp
 
 }
 
+function gluegen_gl2es3() {
+
+if true ; then
+java \
+-classpath \
+../../gluegen/$rootrel/gluegen.jar:../$rootrel/jogl/gluegen-gl.jar \
+com.jogamp.gluegen.GlueGen \
+--debug \
+--dumpCPP \
+-O../$rootrel/jogl \
+-Ecom.jogamp.gluegen.opengl.GLEmitter \
+-C./config/jogl/gl-if-gl2es3-subset.cfg \
+-Istub_includes/jni \
+-Istub_includes/jni/macosx \
+-Istub_includes/jni/win32 \
+-Istub_includes/jni/x11 \
+-Istub_includes/khr \
+-Istub_includes/khr/KD \
+-Istub_includes/khr/KHR \
+-Istub_includes/macosx \
+-Istub_includes/macosx/AppKit \
+-Istub_includes/macosx/OpenGL \
+-Istub_includes/macosx/QuartzCore \
+-Istub_includes/opengl \
+-Istub_includes/opengl/GL \
+-Istub_includes/opengl/GL3 \
+-Istub_includes/opengl/GLES \
+-Istub_includes/opengl/GLES2 \
+-Istub_includes/win32 \
+-Istub_includes/x11 \
+-Istub_includes/x11/X11 \
+-Istub_includes/x11/X11/extensions \
+-I../../gluegen/make/stub_includes/gluegen \
+stub_includes/opengl/gles3.c \
+
+copy_temp
+
+fi
+
+if true ; then
+
+java \
+-classpath \
+../../gluegen/$rootrel/gluegen.jar:../$rootrel/jogl/gluegen-gl.jar \
+com.jogamp.gluegen.GlueGen \
+--debug \
+--dumpCPP \
+-O../$rootrel/jogl \
+-Ecom.jogamp.gluegen.opengl.GLEmitter \
+-C./config/jogl/gl-if-gl2_es3.cfg \
+-Istub_includes/jni \
+-Istub_includes/jni/macosx \
+-Istub_includes/jni/win32 \
+-Istub_includes/jni/x11 \
+-Istub_includes/khr \
+-Istub_includes/khr/KD \
+-Istub_includes/khr/KHR \
+-Istub_includes/macosx \
+-Istub_includes/macosx/AppKit \
+-Istub_includes/macosx/OpenGL \
+-Istub_includes/macosx/QuartzCore \
+-Istub_includes/opengl \
+-Istub_includes/opengl/GL \
+-Istub_includes/opengl/GL3 \
+-Istub_includes/opengl/GLES \
+-Istub_includes/opengl/GLES2 \
+-Istub_includes/win32 \
+-Istub_includes/x11 \
+-Istub_includes/x11/X11 \
+-Istub_includes/x11/X11/extensions \
+-I../../gluegen/make/stub_includes/gluegen \
+stub_includes/opengl/gl2.c \
+
+copy_temp
+
+fi 
+
+}
 function gluegen_gl3es3() {
 java \
 -classpath \
@@ -237,7 +336,43 @@ com.jogamp.gluegen.GlueGen \
 --dumpCPP \
 -O../$rootrel/jogl \
 -Ecom.jogamp.gluegen.opengl.GLEmitter \
--C./config/jogl/gl-es3.cfg \
+-C./config/jogl/gl-if-es3.cfg \
+-Istub_includes/jni \
+-Istub_includes/jni/macosx \
+-Istub_includes/jni/win32 \
+-Istub_includes/jni/x11 \
+-Istub_includes/khr \
+-Istub_includes/khr/KD \
+-Istub_includes/khr/KHR \
+-Istub_includes/macosx \
+-Istub_includes/macosx/AppKit \
+-Istub_includes/macosx/OpenGL \
+-Istub_includes/macosx/QuartzCore \
+-Istub_includes/opengl \
+-Istub_includes/opengl/GL \
+-Istub_includes/opengl/GL3 \
+-Istub_includes/opengl/GLES \
+-Istub_includes/opengl/GLES2 \
+-Istub_includes/win32 \
+-Istub_includes/x11 \
+-Istub_includes/x11/X11 \
+-Istub_includes/x11/X11/extensions \
+-I../../gluegen/make/stub_includes/gluegen \
+stub_includes/opengl/gles3.c \
+
+copy_temp
+
+}
+function gluegen_es3_impl() {
+java \
+-classpath \
+../../gluegen/$rootrel/gluegen.jar:../$rootrel/jogl/gluegen-gl.jar \
+com.jogamp.gluegen.GlueGen \
+--debug \
+--dumpCPP \
+-O../$rootrel/jogl \
+-Ecom.jogamp.gluegen.opengl.GLEmitter \
+-C./config/jogl/gl-es3-impl.cfg \
 -Istub_includes/jni \
 -Istub_includes/jni/macosx \
 -Istub_includes/jni/win32 \
@@ -373,6 +508,117 @@ copy_temp
 
 }
 
+function gluegen_gl4() {
+java \
+-classpath \
+../../gluegen/$rootrel/gluegen.jar:../$rootrel/jogl/gluegen-gl.jar \
+com.jogamp.gluegen.GlueGen \
+--debug \
+--dumpCPP \
+-O../$rootrel/jogl \
+-Ecom.jogamp.gluegen.opengl.GLEmitter \
+-C./config/jogl/gl-if-gl4.cfg \
+-Istub_includes/jni \
+-Istub_includes/jni/macosx \
+-Istub_includes/jni/win32 \
+-Istub_includes/jni/x11 \
+-Istub_includes/khr \
+-Istub_includes/khr/KD \
+-Istub_includes/khr/KHR \
+-Istub_includes/macosx \
+-Istub_includes/macosx/AppKit \
+-Istub_includes/macosx/OpenGL \
+-Istub_includes/macosx/QuartzCore \
+-Istub_includes/opengl \
+-Istub_includes/opengl/GL \
+-Istub_includes/opengl/GL3 \
+-Istub_includes/opengl/GLES \
+-Istub_includes/opengl/GLES2 \
+-Istub_includes/win32 \
+-Istub_includes/x11 \
+-Istub_includes/x11/X11 \
+-Istub_includes/x11/X11/extensions \
+-I../../gluegen/make/stub_includes/gluegen \
+stub_includes/opengl/gl4.c \
+
+copy_temp
+
+}
+function gluegen_gl4bc() {
+java \
+-classpath \
+../../gluegen/$rootrel/gluegen.jar:../$rootrel/jogl/gluegen-gl.jar \
+com.jogamp.gluegen.GlueGen \
+--debug \
+--dumpCPP \
+-O../$rootrel/jogl \
+-Ecom.jogamp.gluegen.opengl.GLEmitter \
+-C./config/jogl/gl-gl4bc.cfg \
+-Istub_includes/jni \
+-Istub_includes/jni/macosx \
+-Istub_includes/jni/win32 \
+-Istub_includes/jni/x11 \
+-Istub_includes/khr \
+-Istub_includes/khr/KD \
+-Istub_includes/khr/KHR \
+-Istub_includes/macosx \
+-Istub_includes/macosx/AppKit \
+-Istub_includes/macosx/OpenGL \
+-Istub_includes/macosx/QuartzCore \
+-Istub_includes/opengl \
+-Istub_includes/opengl/GL \
+-Istub_includes/opengl/GL3 \
+-Istub_includes/opengl/GLES \
+-Istub_includes/opengl/GLES2 \
+-Istub_includes/win32 \
+-Istub_includes/x11 \
+-Istub_includes/x11/X11 \
+-Istub_includes/x11/X11/extensions \
+-I../../gluegen/make/stub_includes/gluegen \
+stub_includes/opengl/gl4bc.c \
+
+copy_temp
+
+}
+
+function gluegen_egl() {
+java \
+'-classpath' \
+../../gluegen/$rootrel/gluegen.jar:../$rootrel/jogl/gluegen-gl.jar \
+'com.jogamp.gluegen.GlueGen' \
+--debug \
+--dumpCPP \
+-O../$rootrel/jogl \
+'-Ecom.jogamp.gluegen.opengl.GLEmitter' \
+'-C./config/jogl/egl.cfg' \
+'-Istub_includes/egl' \
+'-Istub_includes/egl/EGL' \
+'-Istub_includes/khr' \
+'-Istub_includes/khr/KD' \
+'-Istub_includes/khr/KHR' \
+'-I../../gluegen/make/stub_includes/gluegen' \
+'stub_includes/egl/window-system1.c'
+}
+
+function gluegen_eglext() {
+java \
+'-classpath' \
+../../gluegen/$rootrel/gluegen.jar:../$rootrel/jogl/gluegen-gl.jar \
+'com.jogamp.gluegen.GlueGen' \
+--debug \
+--dumpCPP \
+-O../$rootrel/jogl \
+'-Ecom.jogamp.gluegen.opengl.GLEmitter' \
+'-C./config/jogl/eglext.cfg' \
+'-Istub_includes/egl' \
+'-Istub_includes/egl/EGL' \
+'-Istub_includes/khr' \
+'-Istub_includes/khr/KD' \
+'-Istub_includes/khr/KHR' \
+'-I../../gluegen/make/stub_includes/gluegen' \
+'stub_includes/egl/window-system-ext.c'
+}
+
 function gluegen_glx() {
 java \
 -classpath \
@@ -447,6 +693,80 @@ copy_temp
 
 }
 
+function gluegen_cgl() {
+java \
+-classpath \
+../../gluegen/$rootrel/gluegen.jar:../$rootrel/jogl/gluegen-gl.jar \
+com.jogamp.gluegen.GlueGen \
+--debug \
+--dumpCPP \
+-O../$rootrel/jogl \
+-Ecom.jogamp.gluegen.opengl.GLEmitter \
+-C./config/jogl/cgl-macosx.cfg \
+-Istub_includes/jni \
+-Istub_includes/jni/macosx \
+-Istub_includes/jni/win32 \
+-Istub_includes/jni/x11 \
+-Istub_includes/khr \
+-Istub_includes/khr/KD \
+-Istub_includes/khr/KHR \
+-Istub_includes/macosx \
+-Istub_includes/macosx/AppKit \
+-Istub_includes/macosx/OpenGL \
+-Istub_includes/macosx/QuartzCore \
+-Istub_includes/opengl \
+-Istub_includes/opengl/GL \
+-Istub_includes/opengl/GL3 \
+-Istub_includes/opengl/GLES \
+-Istub_includes/opengl/GLES2 \
+-Istub_includes/win32 \
+-Istub_includes/x11 \
+-Istub_includes/x11/X11 \
+-Istub_includes/x11/X11/extensions \
+-I../../gluegen/make/stub_includes/gluegen \
+stub_includes/macosx/window-system1.c \
+
+copy_temp
+
+}
+
+function gluegen_cglext() {
+java \
+-classpath \
+../../gluegen/$rootrel/gluegen.jar:../$rootrel/jogl/gluegen-gl.jar \
+com.jogamp.gluegen.GlueGen \
+--debug \
+--dumpCPP \
+-O../$rootrel/jogl \
+-Ecom.jogamp.gluegen.opengl.GLEmitter \
+-C./config/jogl/cglext.cfg \
+-Istub_includes/jni \
+-Istub_includes/jni/macosx \
+-Istub_includes/jni/win32 \
+-Istub_includes/jni/x11 \
+-Istub_includes/khr \
+-Istub_includes/khr/KD \
+-Istub_includes/khr/KHR \
+-Istub_includes/macosx \
+-Istub_includes/macosx/AppKit \
+-Istub_includes/macosx/OpenGL \
+-Istub_includes/macosx/QuartzCore \
+-Istub_includes/opengl \
+-Istub_includes/opengl/GL \
+-Istub_includes/opengl/GL3 \
+-Istub_includes/opengl/GLES \
+-Istub_includes/opengl/GLES2 \
+-Istub_includes/win32 \
+-Istub_includes/x11 \
+-Istub_includes/x11/X11 \
+-Istub_includes/x11/X11/extensions \
+-I../../gluegen/make/stub_includes/gluegen \
+stub_includes/macosx/cglext.c \
+
+copy_temp
+
+}
+
 function gluegen_wgl() {
 java \
 -classpath \
@@ -521,16 +841,16 @@ copy_temp
 
 }
 
-function gluegen_gl4bc() {
+function gluegen_glugl2() {
 java \
 -classpath \
 ../../gluegen/$rootrel/gluegen.jar:../$rootrel/jogl/gluegen-gl.jar \
 com.jogamp.gluegen.GlueGen \
---debug \
 --dumpCPP \
+--logLevel INFO \
 -O../$rootrel/jogl \
 -Ecom.jogamp.gluegen.opengl.GLEmitter \
--C./config/jogl/gl-gl4bc.cfg \
+-C./config/jogl/glu-gl2.cfg \
 -Istub_includes/jni \
 -Istub_includes/jni/macosx \
 -Istub_includes/jni/win32 \
@@ -552,27 +872,41 @@ com.jogamp.gluegen.GlueGen \
 -Istub_includes/x11/X11 \
 -Istub_includes/x11/X11/extensions \
 -I../../gluegen/make/stub_includes/gluegen \
-stub_includes/opengl/gl4bc.c \
+stub_includes/opengl/glu.c \
 
 copy_temp
 
 }
 
 function gluegen_all() {
+# bash scripts/make.jogl.all.linux-x86_64.sh -f build-jogl.xml build.gluegen-gl.jar
+
+#   gluegen_jawt_x11
+#
 #   gluegen_if_gl
 #   gluegen_gl2es1
 #   gluegen_es1
-   gluegen_gl2es2
+#   gluegen_gl2es2
 #   gluegen_es2
+   gluegen_gl2es3
 #   gluegen_gl3es3
 #   gluegen_es3
+#   gluegen_es3_impl
 #   gluegen_gl2
 #   gluegen_gl2gl3
+#   gluegen_gl4
 #   gluegen_gl4bc
+#
+#   gluegen_egl
+#   gluegen_eglext
 #   gluegen_glx
 #   gluegen_glxext
+#   gluegen_cgl
+#   gluegen_cglext
 #   gluegen_wgl
 #   gluegen_wglext
+
+#   gluegen_glugl2
 }
 
 gluegen_all 2>&1 | tee $(basename $0 .sh).log
diff --git a/make/scripts/tests.sh b/make/scripts/tests.sh
index 1232a82a4..f9239345b 100644
--- a/make/scripts/tests.sh
+++ b/make/scripts/tests.sh
@@ -397,7 +397,7 @@ function testawtswt() {
 #testnoawt com.jogamp.newt.NewtVersion $*
 #testnoawt com.jogamp.oculusvr.OVRVersion $*
 
-#testnoawt com.jogamp.newt.opengl.GLWindow $*
+testnoawt com.jogamp.newt.opengl.GLWindow $*
 #testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestGLVersionParsing00NEWT $*
 #testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestMainVersionGLWindowNEWT $*
 #testawt com.jogamp.opengl.test.junit.jogl.acore.TestMainVersionGLCanvasAWT $*
@@ -414,7 +414,7 @@ function testawtswt() {
 # HiDPI
 #
 #testnoawt com.jogamp.opengl.test.junit.jogl.demos.es2.newt.TestGearsES2NEWT $*
-testawt com.jogamp.opengl.test.junit.jogl.demos.es2.awt.TestGearsES2GLJPanelAWT $*
+#testawt com.jogamp.opengl.test.junit.jogl.demos.es2.awt.TestGearsES2GLJPanelAWT $*
 #testawt com.jogamp.opengl.test.junit.jogl.demos.es2.awt.TestGearsES2AWT $*
 #testawt com.jogamp.opengl.test.junit.jogl.demos.es2.newt.TestGearsES2NewtCanvasAWT $*
 #testnoawt com.jogamp.opengl.test.junit.jogl.glsl.TestRulerNEWT01 $*