diff options
| -rwxr-xr-x | make/scripts/tests.sh | 7 | ||||
| -rw-r--r-- | src/jogl/classes/jogamp/opengl/x11/glx/X11GLXContext.java | 7 |
2 files changed, 2 insertions, 12 deletions
diff --git a/make/scripts/tests.sh b/make/scripts/tests.sh index 6d9e553d3..72939eb44 100755 --- a/make/scripts/tests.sh +++ b/make/scripts/tests.sh @@ -52,11 +52,8 @@ function jrun() { swton=$1 shift - #D_ARGS="-Djogamp.common.utils.locks.Lock.timeout=3000 -Djogamp.debug.Lock" - #D_ARGS="-Djogl.debug.Threading=true -Djogl.debug.GLCanvas -Djogl.debug.GLJPanel" - #D_ARGS="-Djogl.debug.Threading=true -Djogl.debug.GLCanvas -Djogl.debug.GLX_MAKE_CURRENT" - #D_ARGS="-Djogl.1thread=true -Djogl.debug.Threading=true -Djogl.debug.GLCanvas -Djogl.debug.GLX_MAKE_CURRENT -Dnativewindow.debug.GraphicsConfiguration" - D_ARGS="-Djogl.1thread=true -Djogl.debug.Threading=true -Djogl.debug.GLX_MAKE_CURRENT" + #D_ARGS="-Djogl.1thread=false -Djogl.debug.Threading" + D_ARGS="-Djogl.1thread=true -Djogl.debug.Threading" #D_ARGS="-Djogl.debug.DebugGL -Djogl.debug.TraceGL -Djogl.debug.GLContext -Djogl.debug.GLContext.TraceSwitch" #D_ARGS="-Djogl.debug.DebugGL -Djogl.debug.TraceGL -Djogl.debug.GLContext.TraceSwitch -Djogl.debug=all" #D_ARGS="-Djogl.debug.GLDebugMessageHandler" diff --git a/src/jogl/classes/jogamp/opengl/x11/glx/X11GLXContext.java b/src/jogl/classes/jogamp/opengl/x11/glx/X11GLXContext.java index 5cfd12ef5..2de747136 100644 --- a/src/jogl/classes/jogamp/opengl/x11/glx/X11GLXContext.java +++ b/src/jogl/classes/jogamp/opengl/x11/glx/X11GLXContext.java @@ -55,7 +55,6 @@ import javax.media.opengl.GLProfile; import jogamp.nativewindow.x11.X11Lib; import jogamp.nativewindow.x11.X11Util; -import jogamp.opengl.Debug; import jogamp.opengl.GLContextImpl; import jogamp.opengl.GLDrawableImpl; @@ -64,7 +63,6 @@ import com.jogamp.gluegen.runtime.ProcAddressTable; import com.jogamp.gluegen.runtime.opengl.GLProcAddressResolver; public abstract class X11GLXContext extends GLContextImpl { - private static final boolean DEBUG_GLX_MAKECURRENT = Debug.debug("GLX_MAKE_CURRENT"); private static final Map<String, String> functionNameMap; private static final Map<String, String> extensionNameMap; private GLXExt _glXExt; @@ -139,11 +137,6 @@ public abstract class X11GLXContext extends GLContextImpl { boolean res = false; try { - if(DEBUG_GLX_MAKECURRENT) { - System.err.println(getThreadName()+": glXMakeContextCurrent(dpy "+toHexString(dpy)+", write "+ toHexString(writeDrawable)+ - ", read "+toHexString(readDrawable)+", ctx "+toHexString(ctx)+") - GLX >= 1.3 "+ isGLXVersionGreaterEqualOneThree()); - Thread.dumpStack(); - } if ( isGLXVersionGreaterEqualOneThree() ) { res = GLX.glXMakeContextCurrent(dpy, writeDrawable, readDrawable, ctx); } else if ( writeDrawable == readDrawable ) { |