Adapt to GlueGen commit 2f6586292cd298bbc19d8acda0f7cf303c82078b (compount call-by-value extension)

- GLU*: initializeImpl() is no more required, since it's not forced .. uncomment in manual static initializer
- GLX: 'ForceStaticInitCode GLX', i.e. forcing native code, as used in our manual implementation.

7 files changed, 8 insertions, 7 deletions

diff --git a/make/config/jogl/glu-CustomJavaCode-base.java b/make/config/jogl/glu-CustomJavaCode-base.java
index 48fe31329..2401e9c94 100644
--- a/make/config/jogl/glu-CustomJavaCode-base.java
+++ b/make/config/jogl/glu-CustomJavaCode-base.java
@@ -89,7 +89,7 @@ static {
     } catch (Throwable t) {}
     gl2Class = _gl2Class;
     gl2es1Class = _gl2es1Class;
-    /** No native code, not required nor possible
+    /** Not required nor forced
     if( !initializeImpl() ) {
         throw new RuntimeException("Initialization failure");
     } */
diff --git a/make/config/jogl/glu-CustomJavaCode-gl2.java b/make/config/jogl/glu-CustomJavaCode-gl2.java
index c8ac9403b..3ccf6c1d4 100644
--- a/make/config/jogl/glu-CustomJavaCode-gl2.java
+++ b/make/config/jogl/glu-CustomJavaCode-gl2.java
@@ -7,10 +7,10 @@ static {
         if (val != null && !val.toLowerCase().equals("false")) {
           useJavaMipmapCode = false;
         }
-        // Native code exists
+        /** Not required nor forced
         if( !initializeImpl() ) {
             throw new RuntimeException("Initialization failure");
-        }
+        } */
         return null;
       }
     });
diff --git a/make/config/jogl/glu-CustomJavaCode-gl2es1.java b/make/config/jogl/glu-CustomJavaCode-gl2es1.java
index de9c65b8d..a1f689f42 100644
--- a/make/config/jogl/glu-CustomJavaCode-gl2es1.java
+++ b/make/config/jogl/glu-CustomJavaCode-gl2es1.java
@@ -8,7 +8,7 @@ static {
         if (val != null && !val.toLowerCase().equals("false")) {
           useJavaMipmapCode = false;
         }
-        // No native code, not required nor possible
+        // Not required nor forced
         // if( !initializeImpl() ) {
         //     throw new RuntimeException("Initialization failure");
         // }
diff --git a/make/config/jogl/glu-base.cfg b/make/config/jogl/glu-base.cfg
index 93aff1fa9..05aa2110e 100644
--- a/make/config/jogl/glu-base.cfg
+++ b/make/config/jogl/glu-base.cfg
@@ -18,7 +18,7 @@ Ignore gluScaleImage
 
 # Custom Java code for GLU class
 IncludeAs CustomJavaCode GLU glu-CustomJavaCode-base.java
-ManualStaticInit GLU
+ManualStaticInitCall GLU
 
 # Imports for the Error and Registry classes
 Import jogamp.opengl.glu.error.Error
diff --git a/make/config/jogl/glu-gl2.cfg b/make/config/jogl/glu-gl2.cfg
index 9a15645a6..696e07050 100644
--- a/make/config/jogl/glu-gl2.cfg
+++ b/make/config/jogl/glu-gl2.cfg
@@ -34,7 +34,7 @@ CustomCCode #include <GL/glu.h>
 
 # Custom Java code for GLU class
 IncludeAs CustomJavaCode GLUgl2 glu-CustomJavaCode-gl2.java
-ManualStaticInit GLUgl2
+ManualStaticInitCall GLUgl2
 
 # GLU needs access to the GLUtesselatorImpl class for GLUtesselator,
 # to the Mipmap class for scaling and mipmap generation,
diff --git a/make/config/jogl/glu-gl2es1.cfg b/make/config/jogl/glu-gl2es1.cfg
index 35dd6a2e0..ef9405fac 100644
--- a/make/config/jogl/glu-gl2es1.cfg
+++ b/make/config/jogl/glu-gl2es1.cfg
@@ -18,7 +18,7 @@ Ignore gluScaleImage
 
 # Custom Java code for GLU class
 IncludeAs CustomJavaCode GLUgl2es1 glu-CustomJavaCode-gl2es1.java
-ManualStaticInit GLUgl2es1
+ManualStaticInitCall GLUgl2es1
 
 Import javax.media.opengl.GLES1
 Import jogamp.opengl.glu.mipmap.Mipmap
diff --git a/make/config/jogl/glx-x11.cfg b/make/config/jogl/glx-x11.cfg
index 1c138c8ae..6a5bdc484 100644
--- a/make/config/jogl/glx-x11.cfg
+++ b/make/config/jogl/glx-x11.cfg
@@ -32,6 +32,7 @@ CustomJavaCode GLX public  static GLXProcAddressTable getGLXProcAddressTable() {
 
 IncludeAs CustomJavaCode GLX glx-CustomJavaCode.java
 IncludeAs CustomCCode        glx-CustomCCode.c
+ForceStaticInitCode GLX
 
 ArgumentIsString XOpenDisplay 0