diff options
Diffstat (limited to 'make')
| -rw-r--r-- | make/config/jogl/gl-common.cfg | 2 | ||||
| -rwxr-xr-x | make/scripts/java-win64-dbg.bat | 3 | ||||
| -rw-r--r-- | make/scripts/tests-x64.bat | 4 | ||||
| -rw-r--r-- | make/scripts/tests.sh | 6 |
4 files changed, 8 insertions, 7 deletions
diff --git a/make/config/jogl/gl-common.cfg b/make/config/jogl/gl-common.cfg index 4e72daa71..f74976d90 100644 --- a/make/config/jogl/gl-common.cfg +++ b/make/config/jogl/gl-common.cfg @@ -450,7 +450,7 @@ ArgumentIsString glTransformFeedbackVaryings 2 # JavaPrologue glGetString if(_context.isExtensionCacheInitialized()) { JavaPrologue glGetString if(GL.GL_EXTENSIONS==name) { -JavaPrologue glGetString return _context.getGLExtensions(); +JavaPrologue glGetString return _context.getGLExtensionsString(); JavaPrologue glGetString } /* else if(GL.GL_VERSION==name) { JavaPrologue glGetString return _context.getGLVersion(); JavaPrologue glGetString } */ diff --git a/make/scripts/java-win64-dbg.bat b/make/scripts/java-win64-dbg.bat index 72119d1dd..1abce8f02 100755 --- a/make/scripts/java-win64-dbg.bat +++ b/make/scripts/java-win64-dbg.bat @@ -15,9 +15,10 @@ 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.GraphicsConfiguration"
+REM 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"
+set D_ARGS="-Djogl.debug=all"
REM set D_ARGS="-Dnewt.debug.Window" "-Dnativewindow.debug.TraceLock"
REM set D_ARGS="-Dnativewindow.debug.TraceLock"
REM set D_ARGS="-Dnewt.debug.Window" "-Dnewt.debug.Display"
diff --git a/make/scripts/tests-x64.bat b/make/scripts/tests-x64.bat index 0780fca7d..a801feffb 100644 --- a/make/scripts/tests-x64.bat +++ b/make/scripts/tests-x64.bat @@ -1,5 +1,5 @@ -REM scripts\java-win64-dbg.bat com.jogamp.newt.opengl.GLWindow -scripts\java-win64.bat com.jogamp.test.junit.jogl.awt.TestAWT01GLn +scripts\java-win64-dbg.bat com.jogamp.newt.opengl.GLWindow +REM scripts\java-win64.bat com.jogamp.test.junit.jogl.awt.TestAWT01GLn REM scripts\java-win64.bat com.jogamp.test.junit.jogl.awt.TestSwingAWT01GLn REM scripts\java-win64-dbg.bat com.jogamp.test.junit.jogl.acore.TestGLProfile01NEWT REM scripts\java-win64-dbg.bat com.jogamp.test.junit.jogl.demos.gl2.gears.newt.TestGearsNEWT -time 30000 diff --git a/make/scripts/tests.sh b/make/scripts/tests.sh index 8c70605dc..3bfaf7247 100644 --- a/make/scripts/tests.sh +++ b/make/scripts/tests.sh @@ -36,7 +36,7 @@ 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="-Djogl.debug=all" + D_ARGS="-Djogl.debug=all" #D_ARGS="-Djogl.debug.GraphicsConfiguration" #D_ARGS="-Djogl.debug.GLCanvas" #X_ARGS="-Dsun.java2d.noddraw=true -Dsun.java2d.opengl=true" @@ -63,7 +63,7 @@ function testawt() { #testnoawt com.jogamp.nativewindow.NativeWindowVersion $* #testnoawt com.jogamp.opengl.JoglVersion $* #testnoawt com.jogamp.newt.NewtVersion $* -#testnoawt com.jogamp.newt.opengl.GLWindow $* +testnoawt com.jogamp.newt.opengl.GLWindow $* #testnoawt com.jogamp.test.junit.jogl.acore.TestGLProfile01NEWT $* #testawt com.jogamp.test.junit.jogl.acore.TestGLProfile01NEWT $* #testnoawt com.jogamp.test.junit.jogl.glsl.TestTransformFeedbackVaryingsBug407NEWT $* @@ -87,7 +87,7 @@ function testawt() { # awt (testawt) # #testawt javax.media.opengl.awt.GLCanvas $* -testawt com.jogamp.test.junit.jogl.awt.TestAWT01GLn $* +#testawt com.jogamp.test.junit.jogl.awt.TestAWT01GLn $* #testawt com.jogamp.test.junit.jogl.awt.TestSwingAWT01GLn #testawt com.jogamp.test.junit.jogl.awt.TestAWT03GLCanvasRecreate01 $* #testawt com.jogamp.test.junit.jogl.awt.TestAWT02WindowClosing |