diff options
Diffstat (limited to 'make')
| -rw-r--r-- | make/config/jogl/glx-x11.cfg | 3 | ||||
| -rw-r--r-- | make/config/nativewindow/x11-CustomJavaCode.java | 3 | ||||
| -rwxr-xr-x | make/java-run.sh | 7 |
3 files changed, 11 insertions, 2 deletions
diff --git a/make/config/jogl/glx-x11.cfg b/make/config/jogl/glx-x11.cfg index bbe805a04..f451fa7f3 100644 --- a/make/config/jogl/glx-x11.cfg +++ b/make/config/jogl/glx-x11.cfg @@ -20,9 +20,10 @@ GetProcAddressTableExpr glxProcAddressTable SkipProcAddressGen glXGetProcAddressARB Import com.jogamp.nativewindow.impl.x11.* +Import com.jogamp.gluegen.runtime.opengl.GLProcAddressResolver -CustomJavaCode GLX private static GLXProcAddressTable glxProcAddressTable = new GLXProcAddressTable(); +CustomJavaCode GLX private static GLXProcAddressTable glxProcAddressTable = new GLXProcAddressTable(new GLProcAddressResolver()); CustomJavaCode GLX public static GLXProcAddressTable getGLXProcAddressTable() { return glxProcAddressTable; } IncludeAs CustomJavaCode GLX glx-CustomJavaCode.java diff --git a/make/config/nativewindow/x11-CustomJavaCode.java b/make/config/nativewindow/x11-CustomJavaCode.java index 44bb1e8d0..6b5831215 100644 --- a/make/config/nativewindow/x11-CustomJavaCode.java +++ b/make/config/nativewindow/x11-CustomJavaCode.java @@ -1,3 +1,6 @@ + static { + X11Util.initSingleton(); // ensure it's loaded and setup + } /** Interface to C language function: <br> <code> XVisualInfo * XGetVisualInfo(Display * , long, XVisualInfo * , int * ); </code> */ public static XVisualInfo[] XGetVisualInfoCopied(long arg0, long arg1, XVisualInfo arg2, int[] arg3, int arg3_offset) diff --git a/make/java-run.sh b/make/java-run.sh index 5e48cef3a..15bcdcd85 100755 --- a/make/java-run.sh +++ b/make/java-run.sh @@ -16,4 +16,9 @@ shift MOSX=0 uname -a | grep -i Darwin && MOSX=1 -java $X_ARGS $* 2>&1 | tee java-run.log +# D_ARGS="-Dgluegen.debug.ProcAddressHelper=true -Dgluegen.debug.NativeLibrary=true -Dnativewindow.debug=all -Djogl.debug=all -Dnewt.debug=all" +# D_ARGS="-Dnativewindow.debug=all -Djogl.debug=all -Dnewt.debug=all -Djogl.debug.GLSLState" +# D_ARGS="-Dnativewindow.debug.X11Util=true -Djogl.debug.GLDrawableFactory=true" +# D_ARGS="-Dnativewindow.debug.X11Util=true" + +java $X_ARGS $D_ARGS $* 2>&1 | tee java-run.log |