summaryrefslogtreecommitdiffstats
path: root/make
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2010-04-27 07:18:54 +0200
committerSven Gothel <[email protected]>2010-04-27 07:18:54 +0200
commitd370be30dc75cc3b63246f026090a7377bf07135 (patch)
tree1de511925eefc2f7237d0551fae1e3e417f55805 /make
parentedaf669e1b8c8412c1fd4acfc799138b629bf031 (diff)
- Fix GLProcAddressResolver regression: Use GLProcAddressResolver !
- X11GLXDrawableFactory: - Move shared resource creation/destruction into it's own thread - Remove the ATI hack (no XDisplay closing) for every Display, this is only necessary for the shared XDisplay and in case of AWT. - Newt - Display: Only pumpMessages if device is ready. - X11Display: Verify handle not null at DispatchMessage. - Common recursive ToolkitLock implementation, from src/nativewindow/classes/com/jogamp/nativewindow/impl/LockingNativeWindowFactory.java and src/newt/classes/com/jogamp/newt/Window.java, -> com.jogamp.nativewindow.impl.RecursiveToolkitLock - Unique XLockDisplay/XUnlockDisplay call via X11Util to simplify debugging. X11Util: Added debug code for XLockDisplay/XUnlockDisplay. Added fast LongObjectHashMap Added static lib loading and initialization. Removed active and passive list, as well as unused methods, to easy maintenance. Possible since the only 'uncloseable' Display might be the shareable one. - X11Lib: Added static initialization via X11Util Test: junit/com/jogamp/test/junit/jogl/demos/gl2/gears/TestGears* - Add WindowListener for quit ..
Diffstat (limited to 'make')
-rw-r--r--make/config/jogl/glx-x11.cfg3
-rw-r--r--make/config/nativewindow/x11-CustomJavaCode.java3
-rwxr-xr-xmake/java-run.sh7
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