diff options
author | Sven Gothel <[email protected]> | 2010-11-18 17:06:16 +0100 |
---|---|---|
committer | Sven Gothel <[email protected]> | 2010-11-18 17:06:16 +0100 |
commit | 96af6c9bf2d683115996214cd895f9f9ef7ceea6 (patch) | |
tree | df27c2645d4f4db83c3def16712a5355a6cc2c2d /make/scripts | |
parent | 5356769e7f6ebb0ab1322ab26b2dfb9284054e0d (diff) |
JOGL/AWT: Fix ~ 2 year old regressions: Choose & Use GraphicsConfiguration for Canvas. ; Adding FSAA test.
Canvas/X11:
The Canvas GraphicsConfiguraton should be chosen before the native peer is being created.
Choosing AWT GraphicsConfiguration (all platforms):
Don't filter our capabilities with 'AWTGraphicsConfiguration.setupCapabilitiesRGBABits(capsChosen, gc)',
not necessary (see above) and it would remove ourrequired alpha channel.
Canvas display():
Don't render if drawable is not realized (yet).
Diffstat (limited to 'make/scripts')
-rwxr-xr-x | make/scripts/java-win64-dbg.bat | 2 | ||||
-rwxr-xr-x | make/scripts/make.jogl.all.linux-x86_64.sh | 1 | ||||
-rw-r--r-- | make/scripts/tests.bat | 4 | ||||
-rw-r--r-- | make/scripts/tests.sh | 7 |
4 files changed, 9 insertions, 5 deletions
diff --git a/make/scripts/java-win64-dbg.bat b/make/scripts/java-win64-dbg.bat index 5fa985cea..1d6f02042 100755 --- a/make/scripts/java-win64-dbg.bat +++ b/make/scripts/java-win64-dbg.bat @@ -15,7 +15,7 @@ echo CP_ALL %CP_ALL% REM set D_ARGS="-Djogl.debug.ExtensionAvailabilityCache" "-Djogl.debug=all" "-Dnewt.debug=all" "-Dnativewindow.debug=all" "-Djogamp.debug.ProcAddressHelper=true" "-Djogamp.debug.NativeLibrary=true" "-Djogamp.debug.NativeLibrary.Lookup=true"
REM set D_ARGS="-Djogl.debug.GLContext" "-Djogl.debug.ExtensionAvailabilityCache" "-Djogamp.debug.ProcAddressHelper=true"
-set D_ARGS="-Djogl.debug.GLContext"
+set D_ARGS="-Djogl.debug.GraphicsConfiguration"
REM set D_ARGS="-Djogamp.debug.JNILibLoader=true" "-Djogamp.debug.NativeLibrary=true" "-Djogamp.debug.NativeLibrary.Lookup=true" "-Djogl.debug.GLProfile=true"
REM set D_ARGS="-Djogl.debug=all" "-Dnewt.debug=all" "-Dnativewindow.debug=all" "-Djogamp.debug.Lock" "-Djogamp.debug.Lock.TraceLock"
REM set D_ARGS="-Dnewt.debug.Window" "-Dnativewindow.debug.TraceLock"
diff --git a/make/scripts/make.jogl.all.linux-x86_64.sh b/make/scripts/make.jogl.all.linux-x86_64.sh index 76cd98287..2b63ef0ab 100755 --- a/make/scripts/make.jogl.all.linux-x86_64.sh +++ b/make/scripts/make.jogl.all.linux-x86_64.sh @@ -57,6 +57,7 @@ echo LIBGL_DEBUG: $LIBGL_DEBUG 2>&1 | tee -a $LOGF ant \ $CUSTOMLIBDIR \ + -Djavacdebuglevel="source,lines,vars" \ -Dbuild.noarchives=true \ -Djogl.cg=1 \ -Drootrel.build=build-x86_64 \ diff --git a/make/scripts/tests.bat b/make/scripts/tests.bat index cfb801d79..475acdf8e 100644 --- a/make/scripts/tests.bat +++ b/make/scripts/tests.bat @@ -24,4 +24,6 @@ REM scripts\java-win64-dbg.bat com.jogamp.test.junit.newt.TestScreenMode02NEWT REM scripts\java-win64-dbg.bat com.jogamp.test.junit.newt.TestDisplayLifecycle01NEWT REM scripts\java-win64-dbg.bat com.jogamp.test.junit.newt.parenting.TestParenting01NEWT REM scripts\java-win64-dbg.bat com.jogamp.test.junit.newt.parenting.TestParenting02NEWT -scripts\java-win64-dbg.bat com.jogamp.test.junit.newt.TestCloseNewtAWT +REM scripts\java-win64.bat com.jogamp.test.junit.newt.TestCloseNewtAWT +scripts\java-win64-dbg.bat com.jogamp.test.junit.jogl.caps.TestMultisampleAWT -time 10000 +REM scripts\java-win64-dbg.bat com.jogamp.test.junit.jogl.caps.TestMultisampleNEWT -time 10000 diff --git a/make/scripts/tests.sh b/make/scripts/tests.sh index ce08b50f5..1aa725c94 100644 --- a/make/scripts/tests.sh +++ b/make/scripts/tests.sh @@ -36,8 +36,8 @@ function jrun() { #D_ARGS="-Dnewt.debug.Screen -Dnewt.debug.EDT -Djogamp.debug.Lock" #D_ARGS="-Dnewt.debug.EDT" #D_ARGS="-Djogl.debug=all -Dnativewindow.debug=all -Dnewt.debug=all" - #D_ARGS="-Dnewt.debug=all" - X_ARGS="-Dsun.java2d.noddraw=true -Dsun.java2d.opengl=false" + #D_ARGS="-Djogl.debug=all" + #X_ARGS="-Dsun.java2d.noddraw=true -Dsun.java2d.opengl=false" java $awtarg $X_ARGS $D_ARGS $* 2>&1 | tee -a java-run.log } @@ -98,7 +98,8 @@ function testawt() { #testawt com.jogamp.test.junit.newt.parenting.TestParenting03AWT -time 100000 #testawt com.jogamp.test.junit.newt.parenting.TestParenting03bAWT -time 100000 #testawt com.jogamp.test.junit.newt.TestCloseNewtAWT -testawt com.jogamp.test.junit.jogl.caps.Multisample +testawt com.jogamp.test.junit.jogl.caps.TestMultisampleAWT $* +#testawt com.jogamp.test.junit.jogl.caps.TestMultisampleNEWT $* #testawt $* |