13 files changed, 58 insertions, 25 deletions
diff --git a/make/config/jogl/egl-common.cfg b/make/config/jogl/egl-common.cfg
index 6728588c2..fc52de19d 100644
--- a/make/config/jogl/egl-common.cfg
+++ b/make/config/jogl/egl-common.cfg
@@ -25,6 +25,8 @@ Opaque long EGLSyncKHR
 Opaque boolean EGLBoolean
 Opaque long void *
 
+ImmutableAccess EGLClientPixmapHI
+
 # Make eglGetProcAddress return an opaque long
 Opaque long __EGLFuncPtr
 
diff --git a/make/config/jogl/glu-base.cfg b/make/config/jogl/glu-base.cfg
index 542f8afef..bfd399705 100644
--- a/make/config/jogl/glu-base.cfg
+++ b/make/config/jogl/glu-base.cfg
@@ -18,7 +18,6 @@ Ignore gluScaleImage
 
 # Custom Java code for GLU class
 IncludeAs CustomJavaCode GLU glu-CustomJavaCode-base.java
-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 c38f6a6b4..0182f587c 100644
--- a/make/config/jogl/glu-gl2.cfg
+++ b/make/config/jogl/glu-gl2.cfg
@@ -33,7 +33,6 @@ CustomCCode #include <GL/glu.h>
 
 # Custom Java code for GLU class
 IncludeAs CustomJavaCode GLUgl2 glu-CustomJavaCode-gl2.java
-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 98217da1f..d983fe0ed 100644
--- a/make/config/jogl/glu-gl2es1.cfg
+++ b/make/config/jogl/glu-gl2es1.cfg
@@ -18,7 +18,6 @@ Ignore gluScaleImage
 
 # Custom Java code for GLU class
 IncludeAs CustomJavaCode GLUgl2es1 glu-CustomJavaCode-gl2es1.java
-ManualStaticInitCall GLUgl2es1
 
 Import com.jogamp.opengl.GLES1
 Import jogamp.opengl.glu.mipmap.Mipmap
diff --git a/make/config/jogl/glx-CustomCCode.c b/make/config/jogl/glx-CustomCCode.c
index b4b4f5b0a..bc3ffa5da 100644
--- a/make/config/jogl/glx-CustomCCode.c
+++ b/make/config/jogl/glx-CustomCCode.c
@@ -45,7 +45,7 @@ Java_jogamp_opengl_x11_glx_GLX_dispatch_1glXGetFBConfigAttributes(JNIEnv *env, j
  *     C function: XVisualInfo *  glXGetVisualFromFBConfig(Display *  dpy, GLXFBConfig config);
  */
 JNIEXPORT jobject JNICALL 
-Java_jogamp_opengl_x11_glx_GLX_dispatch_1glXGetVisualFromFBConfig(JNIEnv *env, jclass _unused, jlong dpy, jlong config, jlong procAddress) {
+Java_jogamp_opengl_x11_glx_GLX_dispatch_1glXGetVisualFromFBConfig(JNIEnv *env, jclass _unused, jclass clazzBuffers, jlong dpy, jlong config, jlong procAddress) {
   typedef XVisualInfo* (APIENTRY*_local_PFNGLXGETVISUALFROMFBCONFIG)(Display *  dpy, GLXFBConfig config);
   _local_PFNGLXGETVISUALFROMFBCONFIG ptr_glXGetVisualFromFBConfig;
   XVisualInfo *  _res;
@@ -55,7 +55,7 @@ Java_jogamp_opengl_x11_glx_GLX_dispatch_1glXGetVisualFromFBConfig(JNIEnv *env, j
   _res = (* ptr_glXGetVisualFromFBConfig) ((Display *) (intptr_t) dpy, (GLXFBConfig) (intptr_t) config);
   if (_res == NULL) return NULL;
 
-  jbyteCopy   = JVMUtil_NewDirectByteBufferCopy(env, _res, sizeof(XVisualInfo));
+  jbyteCopy   = JVMUtil_NewDirectByteBufferCopy(env, clazzBuffers, _res, sizeof(XVisualInfo));
   XFree(_res);
 
   return jbyteCopy;
@@ -67,7 +67,7 @@ Java_jogamp_opengl_x11_glx_GLX_dispatch_1glXGetVisualFromFBConfig(JNIEnv *env, j
  *     C function: GLXFBConfig *  glXChooseFBConfig(Display *  dpy, int screen, const int *  attribList, int *  nitems);
  */
 JNIEXPORT jobject JNICALL 
-Java_jogamp_opengl_x11_glx_GLX_dispatch_1glXChooseFBConfig(JNIEnv *env, jclass _unused, jlong dpy, jint screen, jobject attribList, jint attribList_byte_offset, jobject nitems, jint nitems_byte_offset, jlong procAddress) {
+Java_jogamp_opengl_x11_glx_GLX_dispatch_1glXChooseFBConfig(JNIEnv *env, jclass _unused, jclass clazzBuffers, jlong dpy, jint screen, jobject attribList, jint attribList_byte_offset, jobject nitems, jint nitems_byte_offset, jlong procAddress) {
   typedef GLXFBConfig *  (APIENTRY*_local_PFNGLXCHOOSEFBCONFIGPROC)(Display *  dpy, int screen, const int *  attribList, int *  nitems);
   _local_PFNGLXCHOOSEFBCONFIGPROC ptr_glXChooseFBConfig;
   int * _attribList_ptr = NULL;
@@ -105,7 +105,7 @@ Java_jogamp_opengl_x11_glx_GLX_dispatch_1glXChooseFBConfig(JNIEnv *env, jclass _
   }
   // fprintf(stderr, "glXChooseFBConfig.X: Count %d\n", count);
 
-  jbyteCopy   = JVMUtil_NewDirectByteBufferCopy(env, _res, count * sizeof(GLXFBConfig));
+  jbyteCopy   = JVMUtil_NewDirectByteBufferCopy(env, clazzBuffers, _res, count * sizeof(GLXFBConfig));
   XFree(_res);
 
   return jbyteCopy;
@@ -117,7 +117,7 @@ Java_jogamp_opengl_x11_glx_GLX_dispatch_1glXChooseFBConfig(JNIEnv *env, jclass _
  *     C function: GLXFBConfig *  glXGetFBConfigs(Display *  dpy, int screen, int *  nelements);
  */
 JNIEXPORT jobject JNICALL 
-Java_jogamp_opengl_x11_glx_GLX_dispatch_1glXGetFBConfigs(JNIEnv *env, jclass _unused, jlong dpy, jint screen, jobject nelements, jint nelements_byte_offset, jlong procAddress) {
+Java_jogamp_opengl_x11_glx_GLX_dispatch_1glXGetFBConfigs(JNIEnv *env, jclass _unused, jclass clazzBuffers, jlong dpy, jint screen, jobject nelements, jint nelements_byte_offset, jlong procAddress) {
   typedef GLXFBConfig *  (APIENTRY*_local_PFNGLXGETFBCONFIGSPROC)(Display *  dpy, int screen, int *  nelements);
   _local_PFNGLXGETFBCONFIGSPROC ptr_glXGetFBConfigs;
   int * _nelements_ptr = NULL;
@@ -149,7 +149,7 @@ Java_jogamp_opengl_x11_glx_GLX_dispatch_1glXGetFBConfigs(JNIEnv *env, jclass _un
     }
   }
 
-  jbyteCopy   = JVMUtil_NewDirectByteBufferCopy(env, _res, count * sizeof(GLXFBConfig));
+  jbyteCopy   = JVMUtil_NewDirectByteBufferCopy(env, clazzBuffers, _res, count * sizeof(GLXFBConfig));
   XFree(_res);
 
   return jbyteCopy;
@@ -162,7 +162,7 @@ Java_jogamp_opengl_x11_glx_GLX_dispatch_1glXGetFBConfigs(JNIEnv *env, jclass _un
  *     C function: XVisualInfo *  glXChooseVisual(Display *  dpy, int screen, int *  attribList);
  */
 JNIEXPORT jobject JNICALL 
-Java_jogamp_opengl_x11_glx_GLX_dispatch_1glXChooseVisual(JNIEnv *env, jclass _unused, jlong dpy, jint screen, jobject attribList, jint attribList_byte_offset, jlong procAddress) {
+Java_jogamp_opengl_x11_glx_GLX_dispatch_1glXChooseVisual(JNIEnv *env, jclass _unused, jclass clazzBuffers, jlong dpy, jint screen, jobject attribList, jint attribList_byte_offset, jlong procAddress) {
   typedef XVisualInfo *  (APIENTRY*_local_PFNGLXCHOOSEVISUALPROC)(Display *  dpy, int screen, int *  attribList);
   _local_PFNGLXCHOOSEVISUALPROC ptr_glXChooseVisual;
   int * _attribList_ptr = NULL;
@@ -176,7 +176,7 @@ Java_jogamp_opengl_x11_glx_GLX_dispatch_1glXChooseVisual(JNIEnv *env, jclass _un
   _res = (* ptr_glXChooseVisual) ((Display *) (intptr_t) dpy, (int) screen, (int *) _attribList_ptr);
   if (NULL == _res) return NULL;
 
-  jbyteCopy   = JVMUtil_NewDirectByteBufferCopy(env, _res, sizeof(XVisualInfo));
+  jbyteCopy   = JVMUtil_NewDirectByteBufferCopy(env, clazzBuffers, _res, sizeof(XVisualInfo));
   XFree(_res);
 
   return jbyteCopy;
diff --git a/make/config/jogl/glx-CustomJavaCode.java b/make/config/jogl/glx-CustomJavaCode.java
index 5a3ea392b..2a70b4442 100644
--- a/make/config/jogl/glx-CustomJavaCode.java
+++ b/make/config/jogl/glx-CustomJavaCode.java
@@ -28,13 +28,13 @@
     if (__addr_ == 0) {
         throw new GLException("Method \"glXGetVisualFromFBConfig\" not available");
     }
-    final java.nio.ByteBuffer _res = dispatch_glXGetVisualFromFBConfig(dpy, config, __addr_);
+    final java.nio.ByteBuffer _res = dispatch_glXGetVisualFromFBConfig(com.jogamp.common.nio.Buffers.class, dpy, config, __addr_);
     if (_res == null) return null;
     return XVisualInfo.create(Buffers.nativeOrder(_res));
   }
 
   /** Entry point to C language function: - Alias for: <br> <code> XVisualInfo *  glXGetVisualFromFBConfigSGIX, glXGetVisualFromFBConfig(Display *  dpy, GLXFBConfig config); </code>    */
-  private static native java.nio.ByteBuffer dispatch_glXGetVisualFromFBConfig(long dpy, long config, long procAddr);
+  private static native java.nio.ByteBuffer dispatch_glXGetVisualFromFBConfig(Class clazzBuffers, long dpy, long config, long procAddr);
 
 
   /** Entry point to C language function: <code> GLXFBConfig *  glXChooseFBConfig(Display *  dpy, int screen, const int *  attribList, int *  nitems); </code> <br>Part of CORE FUNC
@@ -50,7 +50,7 @@
     if (__addr_ == 0) {
       throw new GLException("Method \"glXChooseFBConfig\" not available");
     }
-    final ByteBuffer _res = dispatch_glXChooseFBConfig(dpy, screen, attribList, Buffers.getDirectBufferByteOffset(attribList), nitems, Buffers.getDirectBufferByteOffset(nitems), __addr_);
+    final ByteBuffer _res = dispatch_glXChooseFBConfig(com.jogamp.common.nio.Buffers.class, dpy, screen, attribList, Buffers.getDirectBufferByteOffset(attribList), nitems, Buffers.getDirectBufferByteOffset(nitems), __addr_);
     if (_res == null) return null;
     return PointerBuffer.wrap(Buffers.nativeOrder(_res));
   }
@@ -58,7 +58,7 @@
   /** Entry point to C language function: <code> GLXFBConfig *  glXChooseFBConfig(Display *  dpy, int screen, const int *  attribList, int *  nitems); </code> <br>Part of CORE FUNC
       @param attribList a direct only {@link java.nio.IntBuffer}
       @param nitems a direct only {@link java.nio.IntBuffer}   */
-  private static native ByteBuffer dispatch_glXChooseFBConfig(long dpy, int screen, Object attribList, int attribList_byte_offset, Object nitems, int nitems_byte_offset, long procAddress);
+  private static native ByteBuffer dispatch_glXChooseFBConfig(Class clazzBuffers, long dpy, int screen, Object attribList, int attribList_byte_offset, Object nitems, int nitems_byte_offset, long procAddress);
 
   /** Entry point to C language function: <code> GLXFBConfig *  glXGetFBConfigs(Display *  dpy, int screen, int *  nelements); </code> <br>Part of <code>GLX_VERSION_1_3</code>
       @param nelements a direct only {@link java.nio.IntBuffer}   */
@@ -70,14 +70,14 @@
     if (__addr_ == 0) {
       throw new GLException(String.format("Method \"%s\" not available", "glXGetFBConfigs"));
     }
-    final ByteBuffer _res = dispatch_glXGetFBConfigs(dpy, screen, nelements, Buffers.getDirectBufferByteOffset(nelements), __addr_);
+    final ByteBuffer _res = dispatch_glXGetFBConfigs(com.jogamp.common.nio.Buffers.class, dpy, screen, nelements, Buffers.getDirectBufferByteOffset(nelements), __addr_);
     if (_res == null) return null;
     return PointerBuffer.wrap(Buffers.nativeOrder(_res));
   }
 
   /** Entry point to C language function: <code> GLXFBConfig *  glXGetFBConfigs(Display *  dpy, int screen, int *  nelements); </code> <br>Part of <code>GLX_VERSION_1_3</code>
       @param nelements a direct only {@link java.nio.IntBuffer}   */
-  private static native ByteBuffer dispatch_glXGetFBConfigs(long dpy, int screen, Object nelements, int nelements_byte_offset, long procAddress);
+  private static native ByteBuffer dispatch_glXGetFBConfigs(Class clazzBuffers, long dpy, int screen, Object nelements, int nelements_byte_offset, long procAddress);
 
 
   /** Entry point to C language function: <code> XVisualInfo *  glXChooseVisual(Display *  dpy, int screen, int *  attribList); </code> <br>Part of <code>GLX_VERSION_1_X</code>
@@ -90,12 +90,12 @@
     if (__addr_ == 0) {
       throw new GLException("Method \"glXChooseVisual\" not available");
     }
-    final ByteBuffer _res = dispatch_glXChooseVisual(dpy, screen, attribList, Buffers.getDirectBufferByteOffset(attribList), __addr_);
+    final ByteBuffer _res = dispatch_glXChooseVisual(com.jogamp.common.nio.Buffers.class, dpy, screen, attribList, Buffers.getDirectBufferByteOffset(attribList), __addr_);
     if (_res == null) return null;
     return XVisualInfo.create(Buffers.nativeOrder(_res));
   }
 
   /** Entry point to C language function: <code> XVisualInfo *  glXChooseVisual(Display *  dpy, int screen, int *  attribList); </code> <br>Part of <code>GLX_VERSION_1_X</code>
       @param attribList a direct only {@link java.nio.IntBuffer}   */
-  private static native ByteBuffer dispatch_glXChooseVisual(long dpy, int screen, Object attribList, int attribList_byte_offset, long procAddress);
+  private static native ByteBuffer dispatch_glXChooseVisual(Class clazzBuffers, long dpy, int screen, Object attribList, int attribList_byte_offset, long procAddress);
 
diff --git a/make/config/jogl/glx-x11.cfg b/make/config/jogl/glx-x11.cfg
index 17b5fa8d7..d17a22aa3 100644
--- a/make/config/jogl/glx-x11.cfg
+++ b/make/config/jogl/glx-x11.cfg
@@ -38,8 +38,6 @@ IncludeAs CustomJavaCode GLX glx-CustomJavaCode.java
 Include glx-headers.cfg
 IncludeAs CustomCCode        glx-CustomCCode.c
 
-ForceStaticInitCode GLX
-
 ArgumentIsString XOpenDisplay 0
 
 Opaque long GLXFBConfig
diff --git a/make/config/jogl/wgl-win32.cfg b/make/config/jogl/wgl-win32.cfg
index b3db05cec..f480ae4ce 100644
--- a/make/config/jogl/wgl-win32.cfg
+++ b/make/config/jogl/wgl-win32.cfg
@@ -23,6 +23,9 @@ LocalProcAddressCallingConvention __ALL__ APIENTRY
 NIOOnly __ALL__
 NIODirectOnly __ALL__
 
+ImmutableAccess RECT
+ImmutableAccess PGPU_DEVICE
+
 AllowNonGLExtensions true
 EmitProcAddressTable true
 ProcAddressTableClassName WGLProcAddressTable
diff --git a/make/config/nativewindow/drm-gbm-lib.cfg b/make/config/nativewindow/drm-gbm-lib.cfg
index ad1311ce1..43bbdc8e3 100644
--- a/make/config/nativewindow/drm-gbm-lib.cfg
+++ b/make/config/nativewindow/drm-gbm-lib.cfg
@@ -28,15 +28,27 @@ ArgumentIsString drmCheckModesettingSupported 0
 # ReturnsString XDisplayString
 # ReturnValueCapacity XRenderFindVisualFormat sizeof(XRenderPictFormat)
 
-ReturnedArrayLength drmModeRes.connectors getCount_connectors()
-ReturnedArrayLength drmModeRes.crtcs getCount_crtcs()
-ReturnedArrayLength drmModeRes.encoders getCount_encoders()
+ImmutableAccess drmModeConnector
 ReturnedArrayLength drmModeConnector.modes getCount_modes()
 ReturnedArrayLength drmModeConnector.props getCount_props()
 ReturnedArrayLength drmModeConnector.prop_values getCount_props()
 ReturnedArrayLength drmModeConnector.encoders getCount_encoders()
+
+ImmutableAccess drmModeCrtc
+
+ImmutableAccess drmModeEncoder
+
+ImmutableAccess drmModeFB
+
+ImmutableAccess drmModeModeInfo
 ReturnsString drmModeModeInfo.name
 
+ImmutableAccess drmModeRes
+ReturnedArrayLength drmModeRes.connectors getCount_connectors()
+ReturnedArrayLength drmModeRes.crtcs getCount_crtcs()
+ReturnedArrayLength drmModeRes.encoders getCount_encoders()
+
+
 IgnoreNot ^(drm|DRM_|gbm_|GBM_).+
 
 Ignore drmHandleEvent
diff --git a/make/config/nativewindow/jawt-common.cfg b/make/config/nativewindow/jawt-common.cfg
index adb6ce49b..4d48c6bf9 100644
--- a/make/config/nativewindow/jawt-common.cfg
+++ b/make/config/nativewindow/jawt-common.cfg
@@ -15,7 +15,17 @@ ReturnValueCapacity JAWT_DrawingSurface.GetDrawingSurfaceInfo sizeof(JAWT_Drawin
 
 IgnoreField JAWT GetComponent
 IgnoreField JAWT_DrawingSurface target
+
+ImmutableAccess JAWT_DrawingSurfaceInfo
 IgnoreField JAWT_DrawingSurfaceInfo platformInfo
+IgnoreField JAWT_DrawingSurfaceInfo ds
+IgnoreField JAWT_DrawingSurfaceInfo clip
+
+ImmutableAccess JAWT_Rectangle
+
+ImmutableAccess JAWT_X11DrawingSurfaceInfo
+ImmutableAccess JAWT_Win32DrawingSurfaceInfo
+ImmutableAccess JAWT_MacOSXDrawingSurfaceInfo
 
 IncludeAs CustomJavaCode JAWT jawt-CustomJavaCode.java
 
diff --git a/make/config/nativewindow/win32-lib.cfg b/make/config/nativewindow/win32-lib.cfg
index d4cb15c41..d039d6e90 100644
--- a/make/config/nativewindow/win32-lib.cfg
+++ b/make/config/nativewindow/win32-lib.cfg
@@ -20,6 +20,14 @@ NIODirectOnly DwmSetWindowAttribute
 NIODirectOnly GetWindowCompositionAccentPolicy
 NIODirectOnly SetWindowCompositionAccentPolicy
 
+ImmutableAccess BITMAPINFO
+# ImmutableAccess BITMAPINFOHEADER
+# ImmutableAccess DWM_BLURBEHIND
+# ImmutableAccess MARGINS
+# ImmutableAccess PIXELFORMATDESCRIPTOR
+ImmutableAccess RECT
+ImmutableAccess RGBQUAD
+
 Import com.jogamp.nativewindow.util.Point
 Import com.jogamp.nativewindow.NativeWindowException
 Import jogamp.nativewindow.NWJNILibLoader
diff --git a/make/config/nativewindow/x11-lib.cfg b/make/config/nativewindow/x11-lib.cfg
index 0bbe1c420..65dec9445 100644
--- a/make/config/nativewindow/x11-lib.cfg
+++ b/make/config/nativewindow/x11-lib.cfg
@@ -24,6 +24,10 @@ Opaque long GLXContext
 Opaque long GLXFBConfig
 Opaque long void *
 
+ImmutableAccess XRenderDirectFormat
+ImmutableAccess XRenderPictFormat
+# ImmutableAccess XVisualInfo
+
 IncludeAs CustomJavaCode X11Lib x11-CustomJavaCode.java
 
 ArgumentIsString XOpenDisplay 0
diff --git a/make/config/oculusvr/oculusvr.cfg b/make/config/oculusvr/oculusvr.cfg
index b2870e59a..23531c040 100644
--- a/make/config/oculusvr/oculusvr.cfg
+++ b/make/config/oculusvr/oculusvr.cfg
@@ -9,7 +9,6 @@ Import com.jogamp.common.util.SecurityUtil
 Import java.security.PrivilegedAction
 
 IncludeAs CustomJavaCode OVR oculusvr-ovr-CustomJavaCode.java
-ManualStaticInitCall OVR
 
 # Provide #includes to native code
 CustomCCode #define HEADLESS_APP 1