diff options
| -rw-r--r-- | java-dbg.sh | 2 | ||||
| -rw-r--r-- | java-win32-dbg.bat | 4 | ||||
| -rwxr-xr-x | src/demos/GLInfo.java | 2 | ||||
| -rwxr-xr-x | src/demos/context/DualContext.java | 4 | ||||
| -rwxr-xr-x | src/demos/es1/RedSquare.java | 2 | ||||
| -rwxr-xr-x | src/demos/es2/RedSquare.java | 3 | ||||
| -rwxr-xr-x | src/demos/testContextDestruction/TestContextDestruction.java | 1 |
7 files changed, 11 insertions, 7 deletions
diff --git a/java-dbg.sh b/java-dbg.sh index fd88bcd..4298a82 100644 --- a/java-dbg.sh +++ b/java-dbg.sh @@ -1,7 +1,7 @@ #! /bin/sh # java -Dgluegen.debug.ProcAddressHelper=true -Dgluegen.debug.NativeLibrary=true -Dnativewindow.debug=all -Djogl.debug=all $* 2>&1 | tee java-dbg.log -java -Dnewt.debug=all -Dnativewindow.debug=all -Djogl.debug=all $* 2>&1 | tee java-dbg.log +java -Dnewt.debug.Window -Dnativewindow.debug=all -Djogl.debug=all $* 2>&1 | tee java-dbg.log # java -Djogl.debug=all $* 2>&1 | tee java-dbg.log diff --git a/java-win32-dbg.bat b/java-win32-dbg.bat index c263813..dc9c8d2 100644 --- a/java-win32-dbg.bat +++ b/java-win32-dbg.bat @@ -15,7 +15,7 @@ echo CLASSPATH %CLASSPATH% echo PATH %PATH% REM java "-Dgluegen.debug.ProcAddressHelper" "-Dgluegen.debug.NativeLibrary=true" "-Djava.library.path=%LIB_DIR%" "-Dnativewindow.debug=all" "-Djogl.debug=all" %1 %2 %3 %4 > java-win32-dbg.log 2>&1 -REM java "-Dgluegen.debug.NativeLibrary=true" "-Dnativewindow.debug=all" "-Djogl.debug=all" "-Dsun.java2d.noddraw=true" "-Dsun.awt.noerasebackground=true" "-Djava.library.path=%LIB_DIR%" %1 %2 %3 %4 > java-win32-dbg.log 2>&1 -java "-Dnativewindow.debug=all" "-Djogl.debug=all" "-Dsun.java2d.noddraw=true" "-Dsun.awt.noerasebackground=true" "-Djava.library.path=%LIB_DIR%" %1 %2 %3 %4 > java-win32-dbg.log 2>&1 +REM java "-Dgluegen.debug.NativeLibrary=true" "-Dnewt.debug=all" "-Dnativewindow.debug=all" "-Djogl.debug=all" "-Dsun.java2d.noddraw=true" "-Dsun.awt.noerasebackground=true" "-Djava.library.path=%LIB_DIR%" %1 %2 %3 %4 > java-win32-dbg.log 2>&1 +java "-Dnewt.debug.Window" "-Dnativewindow.debug=all" "-Djogl.debug=all" "-Dsun.java2d.noddraw=true" "-Dsun.awt.noerasebackground=true" "-Djava.library.path=%LIB_DIR%" %1 %2 %3 %4 > java-win32-dbg.log 2>&1 diff --git a/src/demos/GLInfo.java b/src/demos/GLInfo.java index ba5f337..28f17be 100755 --- a/src/demos/GLInfo.java +++ b/src/demos/GLInfo.java @@ -150,7 +150,7 @@ public class GLInfo extends Thread implements GLEventListener { public static void main(String[] args) { String glprofile = null; int type = USE_NEWT ; - for(int i=args.length-1; i>=0; i--) { + for(int i=0; i<args.length; i++) { if(args[i].equals("-awt")) { type |= USE_AWT; } diff --git a/src/demos/context/DualContext.java b/src/demos/context/DualContext.java index dfb07f6..5f62d19 100755 --- a/src/demos/context/DualContext.java +++ b/src/demos/context/DualContext.java @@ -142,9 +142,11 @@ public class DualContext extends Canvas { public static void main(String[] args) { JFrame frame = new JFrame("Dual OpenGL Context Test"); + GLProfile glp = GLProfile.GetProfileDefault(); // warm up .. + AWTGraphicsScreen screen = (AWTGraphicsScreen)AWTGraphicsScreen.createDefault(); AWTGraphicsConfiguration config = (AWTGraphicsConfiguration) - GraphicsConfigurationFactory.getFactory(AWTGraphicsDevice.class).chooseGraphicsConfiguration(new GLCapabilities(null), null, screen); + GraphicsConfigurationFactory.getFactory(AWTGraphicsDevice.class).chooseGraphicsConfiguration(new GLCapabilities(glp), null, screen); final DualContext dc = new DualContext(config); frame.getContentPane().add(dc, BorderLayout.CENTER); diff --git a/src/demos/es1/RedSquare.java b/src/demos/es1/RedSquare.java index 79a3c26..7541e0f 100755 --- a/src/demos/es1/RedSquare.java +++ b/src/demos/es1/RedSquare.java @@ -225,7 +225,7 @@ public class RedSquare extends Thread implements WindowListener, KeyListener, Mo public static void main(String[] args) { String glprofile = null; int type = USE_NEWT ; - for(int i=args.length-1; i>=0; i--) { + for(int i=0; i<args.length; i++) { if(args[i].equals("-awt")) { type |= USE_AWT; } diff --git a/src/demos/es2/RedSquare.java b/src/demos/es2/RedSquare.java index cd3042c..246eced 100755 --- a/src/demos/es2/RedSquare.java +++ b/src/demos/es2/RedSquare.java @@ -88,6 +88,7 @@ public class RedSquare extends Thread implements WindowListener, MouseListener, window.setSize(width, height); // window.setFullscreen(true); window.setVisible(true); + window.enablePerfLog(true); } catch (Throwable t) { t.printStackTrace(); } @@ -269,7 +270,7 @@ public class RedSquare extends Thread implements WindowListener, MouseListener, public static void main(String[] args) { String glprofile = null; int type = USE_NEWT ; - for(int i=args.length-1; i>=0; i--) { + for(int i=0; i<args.length; i++) { if(args[i].equals("-awt")) { type |= USE_AWT; } diff --git a/src/demos/testContextDestruction/TestContextDestruction.java b/src/demos/testContextDestruction/TestContextDestruction.java index d0c3a8f..a012639 100755 --- a/src/demos/testContextDestruction/TestContextDestruction.java +++ b/src/demos/testContextDestruction/TestContextDestruction.java @@ -217,6 +217,7 @@ public class TestContextDestruction { } public void dispose(GLAutoDrawable drawable) { + System.out.println("Listener.dispose()"); } public void display(GLAutoDrawable drawable) { |