diff options
author | Sven Gothel <[email protected]> | 2011-06-26 16:32:35 +0200 |
---|---|---|
committer | Sven Gothel <[email protected]> | 2011-06-26 16:32:35 +0200 |
commit | 7d21b3e694d716f4b8ce640127001e38cb059981 (patch) | |
tree | 4b2c83b1606f229ec98a13c8bbab055e08389a06 | |
parent | f3c91d904a22fe29f3b122085722a8b05bbae63a (diff) |
Fix NEWT GL ctx/offscreen (GPUMemSec..) tests: Use pbuffer (i.e. hw accel GL driver)
-rwxr-xr-x | make/scripts/java-win64-dbg.bat | 2 | ||||
-rwxr-xr-x | make/scripts/tests-x64.bat | 5 | ||||
-rwxr-xr-x | make/scripts/tests.sh | 4 | ||||
-rw-r--r-- | src/test/com/jogamp/opengl/test/junit/util/NEWTGLContext.java | 1 |
4 files changed, 8 insertions, 4 deletions
diff --git a/make/scripts/java-win64-dbg.bat b/make/scripts/java-win64-dbg.bat index 950b6a92e..10bba67e6 100755 --- a/make/scripts/java-win64-dbg.bat +++ b/make/scripts/java-win64-dbg.bat @@ -20,7 +20,7 @@ REM set D_ARGS="-Djogamp.debug.JNILibLoader=true" "-Djogamp.debug.NativeLibrary= REM set D_ARGS="-Djogl.debug=all" "-Dnewt.debug=all" "-Dnativewindow.debug=all" "-Djogamp.debug.Lock" "-Djogamp.debug.Lock.TraceLock"
REM set D_ARGS="-Djogl.debug=all" "-Dnativewindow.debug=all"
REM set D_ARGS="-Djogl.debug=all"
-set D_ARGS="-Djogl.debug.GLDebugMessageHandler" "-Djogl.debug.DebugGL"
+set D_ARGS="-Djogl.debug.GLDebugMessageHandler" "-Djogl.debug.DebugGL" "-Djogl.debug.TraceGL"
REM set D_ARGS="-Djogl.debug.GLContext" "-Dnewt.debug=all"
REM set D_ARGS="-Dnewt.debug.Window" "-Dnativewindow.debug.TraceLock"
REM set D_ARGS="-Dnativewindow.debug.TraceLock"
diff --git a/make/scripts/tests-x64.bat b/make/scripts/tests-x64.bat index ceb282ece..cfd60d920 100755 --- a/make/scripts/tests-x64.bat +++ b/make/scripts/tests-x64.bat @@ -68,5 +68,8 @@ REM scripts\java-win64.bat com.jogamp.opengl.test.junit.graph.demos.GPURegionNew REM scripts\java-win64.bat com.jogamp.opengl.test.junit.jogl.acore.TestGLDebug00NEWT $* REM scripts\java-win64-dbg.bat com.jogamp.opengl.test.junit.jogl.acore.TestGLDebug01NEWT $* -scripts\java-win64.bat com.jogamp.opengl.test.junit.jogl.glsl.TestRulerNEWT01 +REM scripts\java-win64.bat com.jogamp.opengl.test.junit.jogl.acore.TestGPUMemSec01NEWT $* +scripts\java-win64-dbg.bat com.jogamp.opengl.test.junit.jogl.acore.TestGPUMemSec01NEWT $* + +REM scripts\java-win64.bat com.jogamp.opengl.test.junit.jogl.glsl.TestRulerNEWT01 REM scripts\java-win64.bat com.jogamp.opengl.test.junit.jogl.glsl.TestFBOMRTNEWT01 diff --git a/make/scripts/tests.sh b/make/scripts/tests.sh index 8a37701b1..3f7c747f8 100755 --- a/make/scripts/tests.sh +++ b/make/scripts/tests.sh @@ -139,7 +139,7 @@ function testawtmt() { #testnoawt com.jogamp.opengl.test.junit.newt.TestRemoteWindow01NEWT $* #testnoawt com.jogamp.opengl.test.junit.newt.TestRemoteGLWindows01NEWT $* #testawt com.jogamp.opengl.test.junit.jogl.demos.gl2.gears.newt.TestGearsNEWT $* -testnoawt com.jogamp.opengl.test.junit.jogl.demos.gl2.gears.newt.TestGearsNEWT $* +#testnoawt com.jogamp.opengl.test.junit.jogl.demos.gl2.gears.newt.TestGearsNEWT $* #testnoawt com.jogamp.opengl.test.junit.newt.TestGLWindows02NEWTAnimated $* #testawt com.jogamp.opengl.test.junit.newt.TestDisplayLifecycle01NEWT #testawt com.jogamp.opengl.test.junit.newt.TestDisplayLifecycle02NEWT @@ -223,7 +223,7 @@ testnoawt com.jogamp.opengl.test.junit.jogl.demos.gl2.gears.newt.TestGearsNEWT $ #testnoawt com.jogamp.opengl.test.junit.graph.demos.GPURegionNewtDemo01 $* #testnoawt com.jogamp.opengl.test.junit.graph.demos.GPURegionNewtDemo02 $* -#testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestGPUMemSec01NEWT $* +testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestGPUMemSec01NEWT $* $spath/count-edt-start.sh java-run.log diff --git a/src/test/com/jogamp/opengl/test/junit/util/NEWTGLContext.java b/src/test/com/jogamp/opengl/test/junit/util/NEWTGLContext.java index 3992c0876..a4449e6d6 100644 --- a/src/test/com/jogamp/opengl/test/junit/util/NEWTGLContext.java +++ b/src/test/com/jogamp/opengl/test/junit/util/NEWTGLContext.java @@ -57,6 +57,7 @@ public class NEWTGLContext { public static WindowContext createOffscreenWindow(GLProfile glp, int width, int height, boolean debugGL) throws InterruptedException { GLCapabilities caps = new GLCapabilities(glp); caps.setOnscreen(false); + caps.setPBuffer(true); // // Create native windowing resources .. X11/Win/OSX |