Adding Mesa Quirk 'NoSetSwapIntervalPostRetarget': SIGSEGV on setSwapInterval() after changing the context's drawable w/ 'Mesa 8.0.4' dri2SetSwapInterval/DRI2 (soft & intel)

Analyzing 'TestGLContextDrawableSwitchNEWT' crash at setSwapInterval -> dri2SetSwapInterval
after retargeting the context (new drawable association).
Turns out Mesa's dri2SetSwapInterval may have a bug.

+++

GLContext TRACE_SWITCH: Add drawable handle to debug/trace output.

6 files changed, 64 insertions, 38 deletions

diff --git a/make/scripts/tests.sh b/make/scripts/tests.sh
index 7faca0b42..f3a71d288 100755
--- a/make/scripts/tests.sh
+++ b/make/scripts/tests.sh
@@ -92,7 +92,7 @@ function jrun() {
     #D_ARGS="-Djogl.debug.EGLDisplayUtil -Dnativewindow.debug.X11Util"
     #D_ARGS="-Djogl.debug.GLDrawable"
     #D_ARGS="-Dnewt.test.Screen.disableScreenMode -Dnewt.debug.Screen"
-    D_ARGS="-Dnewt.debug.Screen -Djogl.debug.Animator"
+    #D_ARGS="-Dnewt.debug.Screen -Djogl.debug.Animator"
     #D_ARGS="-Djogl.debug.ExtensionAvailabilityCache -Djogl.debug=all -Dnativewindow.debug=all -Djogamp.debug.ProcAddressHelper=true -Djogamp.debug.NativeLibrary=true -Djogamp.debug.NativeLibrary.Lookup=true"
     #D_ARGS="-Dnewt.debug.MainThread"
     #D_ARGS="-Dnewt.debug.Window"
@@ -137,6 +137,7 @@ function jrun() {
     #D_ARGS="-Dnativewindow.debug=all"
     #D_ARGS="-Djogl.debug.GLCanvas"
     #D_ARGS="-Djogl.debug.GLContext -Dnativewindow.debug.X11Util.XSync"
+    D_ARGS="-Djogl.debug.GLContext -Dnativewindow.debug.X11Util.XSync"
     #D_ARGS="-Dnativewindow.debug.X11Util.XSync"
     #D_ARGS="-Dnativewindow.debug.ToolkitLock"
     #D_ARGS="-Djogl.debug.graph.curve -Djogl.debug.GLSLCode -Djogl.debug.TraceGL"
@@ -254,7 +255,7 @@ function testawtswt() {
 #testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestSharedContextVBOES1NEWT $*
 #testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestSharedContextVBOES2NEWT $*
 #testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestGLAutoDrawableDelegateNEWT $*
-#testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestGLContextDrawableSwitchNEWT $*
+testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestGLContextDrawableSwitchNEWT $*
 
 #testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestGLAutoDrawableDelegateOnOffscrnCapsNEWT $*
 #testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestGLAutoDrawableGLWindowOnOffscrnCapsNEWT $*
@@ -302,7 +303,7 @@ function testawtswt() {
 #testnoawt com.jogamp.opengl.test.junit.newt.TestScreenMode00bNEWT
 #testnoawt com.jogamp.opengl.test.junit.newt.TestScreenMode01NEWT
 #testnoawt com.jogamp.opengl.test.junit.newt.TestScreenMode01bNEWT
-testnoawt com.jogamp.opengl.test.junit.newt.TestScreenMode02NEWT
+#testnoawt com.jogamp.opengl.test.junit.newt.TestScreenMode02NEWT
 #testnoawt com.jogamp.opengl.test.junit.newt.ManualScreenMode03NEWT
 #testnoawt com.jogamp.opengl.test.junit.newt.TestWindowClosingProtocol02NEWT $*
 #testnoawt -Djava.awt.headless=true com.jogamp.opengl.test.junit.newt.TestGLWindows01NEWT
diff --git a/src/jogl/classes/com/jogamp/opengl/GLRendererQuirks.java b/src/jogl/classes/com/jogamp/opengl/GLRendererQuirks.java
index 13c94c6f2..1bbe22548 100644
--- a/src/jogl/classes/com/jogamp/opengl/GLRendererQuirks.java
+++ b/src/jogl/classes/com/jogamp/opengl/GLRendererQuirks.java
@@ -48,12 +48,15 @@ public class GLRendererQuirks {
     /** No offscreen bitmap available, currently true for JOGL's OSX implementation. */
     public static final int NoOffscreenBitmap       = 3;
     
+    /** SIGSEGV on setSwapInterval() after changing the context's drawable w/ 'Mesa 8.0.4' dri2SetSwapInterval/DRI2 (soft & intel) */
+    public static final int NoSetSwapIntervalPostRetarget = 4;
+    
     /** Number of quirks known. */
-    public static final int COUNT                   = 4;
+    public static final int COUNT                   = 5;
     
     private static final String[] _names = new String[] { "NoDoubleBufferedPBuffer", "NoDoubleBufferedBitmap", "NoSetSwapInterval",
-                                                          "NoOffscreenBitmap" 
-                                                        };    
+                                                          "NoOffscreenBitmap", "NoSetSwapIntervalPostRetarget" 
+                                                        };
 
     private final int _bitmask;
 
diff --git a/src/jogl/classes/javax/media/opengl/GLContext.java b/src/jogl/classes/javax/media/opengl/GLContext.java
index 93b9bfe82..1cee0209c 100644
--- a/src/jogl/classes/javax/media/opengl/GLContext.java
+++ b/src/jogl/classes/javax/media/opengl/GLContext.java
@@ -162,6 +162,9 @@ public abstract class GLContext {
   private int currentSwapInterval;
   protected GLRendererQuirks glRendererQuirks;
 
+  /** Did the drawable association changed ? see {@link GLRendererQuirks#NoSetSwapIntervalPostRetarget} */ 
+  protected boolean drawableRetargeted; 
+    
   protected void resetStates() {
       if (DEBUG) {
         System.err.println(getThreadName() + ": GLContext.resetStates()");
@@ -175,6 +178,7 @@ public abstract class GLContext {
       contextHandle=0;
       currentSwapInterval = -1;
       glRendererQuirks = null;
+      drawableRetargeted = false;
   }
 
   /** 
@@ -781,8 +785,8 @@ public abstract class GLContext {
   }
 
   /**
-   * Set the swap interval if the current context.
-   * @param interval Should be ≥ 0. 0 Disables the vertical synchronisation,
+   * Set the swap interval of the current context and attached drawable.
+   * @param interval Should be ≥ 0. 0 disables the vertical synchronization,
    *                 where ≥ 1 is the number of vertical refreshes before a swap buffer occurs.
    *                 A value < 0 is ignored.
    * @return true if the operation was successful, otherwise false
@@ -792,9 +796,11 @@ public abstract class GLContext {
   public final boolean setSwapInterval(int interval) throws GLException {
     validateCurrent();
     if(0<=interval) {
-        if( setSwapIntervalImpl(interval) ) {
-            currentSwapInterval = interval;
-            return true;
+        if( !drawableRetargeted || !hasRendererQuirk(GLRendererQuirks.NoSetSwapIntervalPostRetarget) ) {
+            if( setSwapIntervalImpl(interval) ) {
+                currentSwapInterval = interval;
+                return true;
+            }
         }
     }
     return false;
@@ -808,15 +814,12 @@ public abstract class GLContext {
    * the default value <code>-1</code> is returned.
    * </p>
    * <p>
-   * The default value for a valid context is <code>1</code> for
-   * an EGL based profile (ES1 or ES2) and <code>-1</code> (undefined)
-   * for desktop.
+   * For a valid context the default value is <code>1</code>
+   * in case of an EGL based profile (ES1 or ES2) and <code>-1</code> 
+   * (undefined) for desktop.
    * </p>
    */
   public final int getSwapInterval() {
-    if(-1 == currentSwapInterval && this.isGLES()) {
-        currentSwapInterval = 1;
-    }
     return currentSwapInterval;
   }
   protected final void setDefaultSwapInterval() {
diff --git a/src/jogl/classes/jogamp/opengl/GLContextImpl.java b/src/jogl/classes/jogamp/opengl/GLContextImpl.java
index e164dfe44..d7f61681f 100644
--- a/src/jogl/classes/jogamp/opengl/GLContextImpl.java
+++ b/src/jogl/classes/jogamp/opengl/GLContextImpl.java
@@ -214,6 +214,7 @@ public abstract class GLContextImpl extends GLContext {
     }
     final GLDrawableImpl old = drawable;
     old.associateContext(this, false);
+    drawableRetargeted = null != drawable;
     drawable = (GLDrawableImpl) readWrite ;
     drawable.associateContext(this, true);
     if(lockHeld) {
@@ -270,7 +271,7 @@ public abstract class GLContextImpl extends GLContext {
   }
   private void release(boolean inDestruction) throws GLException {
     if(TRACE_SWITCH) {
-        System.err.println(getThreadName() +": GLContext.ContextSwitch: obj " + toHexString(hashCode()) + ", ctx "+toHexString(contextHandle)+" - release() - force: "+inDestruction+", "+lock);
+        System.err.println(getThreadName() +": GLContext.ContextSwitch: obj " + toHexString(hashCode()) + ", ctx "+toHexString(contextHandle)+", surf "+toHexString(drawable.getHandle())+" - release() - force: "+inDestruction+", "+lock);
     }
     if ( !lock.isOwner(Thread.currentThread()) ) {
         throw new GLException("Context not current on current thread "+Thread.currentThread().getName()+": "+this);
@@ -296,7 +297,7 @@ public abstract class GLContextImpl extends GLContext {
       drawable.unlockSurface();
       lock.unlock();
       if(TRACE_SWITCH) {
-          System.err.println(getThreadName() +": GLContext.ContextSwitch: obj " + toHexString(hashCode()) + ", ctx "+toHexString(contextHandle)+" - "+(actualRelease?"switch":"keep  ")+" - CONTEXT_RELEASE - "+lock);
+          System.err.println(getThreadName() +": GLContext.ContextSwitch: obj " + toHexString(hashCode()) + ", ctx "+toHexString(contextHandle)+", surf "+toHexString(drawable.getHandle())+" - "+(actualRelease?"switch":"keep  ")+" - CONTEXT_RELEASE - "+lock);
       }
     }
     if(null != drawableContextMadeCurrentException) {
@@ -310,7 +311,7 @@ public abstract class GLContextImpl extends GLContext {
   public final void destroy() {
       if (DEBUG || TRACE_SWITCH) {
           System.err.println(getThreadName() + ": GLContextImpl.destroy.0: obj " + toHexString(hashCode()) + ", ctx " + toHexString(contextHandle) +
-                  ", isShared "+GLContextShareSet.isShared(this)+" - "+lock);
+                  ", surf "+toHexString(drawable.getHandle())+", isShared "+GLContextShareSet.isShared(this)+" - "+lock);
       }
       if (contextHandle != 0) {
           int lockRes = drawable.lockSurface();
@@ -463,7 +464,7 @@ public abstract class GLContextImpl extends GLContext {
                     // For Mac OS X, however, we need to update the context to track resizes
                     drawableUpdatedNotify();
                     if(TRACE_SWITCH) {
-                        System.err.println(getThreadName() +": GLContext.ContextSwitch: obj " + toHexString(hashCode()) + ", ctx "+toHexString(contextHandle)+" - keep   - CONTEXT_CURRENT - "+lock);                        
+                        System.err.println(getThreadName() +": GLContext.ContextSwitch: obj " + toHexString(hashCode()) + ", ctx "+toHexString(contextHandle)+", surf "+toHexString(drawable.getHandle())+" - keep   - CONTEXT_CURRENT - "+lock);                        
                     }
                     return CONTEXT_CURRENT;
                 } else {
@@ -503,7 +504,7 @@ public abstract class GLContextImpl extends GLContext {
 
     if (res == CONTEXT_NOT_CURRENT) {
       if(TRACE_SWITCH) {
-          System.err.println(getThreadName() +": GLContext.ContextSwitch: obj " + toHexString(hashCode()) + ", ctx "+toHexString(contextHandle)+" - switch - CONTEXT_NOT_CURRENT - "+lock);
+          System.err.println(getThreadName() +": GLContext.ContextSwitch: obj " + toHexString(hashCode()) + ", ctx "+toHexString(contextHandle)+", surf "+toHexString(drawable.getHandle())+" - switch - CONTEXT_NOT_CURRENT - "+lock);
       }
     } else {
       setCurrent(this);
@@ -527,10 +528,10 @@ public abstract class GLContextImpl extends GLContext {
         contextRealized(true);
         
         if(DEBUG || TRACE_SWITCH) {
-            System.err.println(getThreadName() +": GLContext.ContextSwitch: obj " + toHexString(hashCode()) + ", ctx "+toHexString(contextHandle)+" - switch - CONTEXT_CURRENT_NEW - "+lock);
+            System.err.println(getThreadName() +": GLContext.ContextSwitch: obj " + toHexString(hashCode()) + ", ctx "+toHexString(contextHandle)+", surf "+toHexString(drawable.getHandle())+" - switch - CONTEXT_CURRENT_NEW - "+lock);
         }
       } else if(TRACE_SWITCH) {
-         System.err.println(getThreadName() +": GLContext.ContextSwitch: obj " + toHexString(hashCode()) + ", ctx "+toHexString(contextHandle)+" - switch - CONTEXT_CURRENT - "+lock);
+         System.err.println(getThreadName() +": GLContext.ContextSwitch: obj " + toHexString(hashCode()) + ", ctx "+toHexString(contextHandle)+", surf "+toHexString(drawable.getHandle())+" - switch - CONTEXT_CURRENT - "+lock);
       }
 
       contextMadeCurrent(true);
@@ -568,10 +569,10 @@ public abstract class GLContextImpl extends GLContext {
         }
         if (DEBUG || TRACE_SWITCH) {
             if(created) {
-                System.err.println(getThreadName() + ": Create GL context OK: obj " + toHexString(hashCode()) + ", ctx " + toHexString(contextHandle) + " for " + getClass().getName()+" - "+getGLVersion());
+                System.err.println(getThreadName() + ": Create GL context OK: obj " + toHexString(hashCode()) + ", ctx " + toHexString(contextHandle) + ", surf "+toHexString(drawable.getHandle())+" for " + getClass().getName()+" - "+getGLVersion());
                 // Thread.dumpStack();
             } else {
-                System.err.println(getThreadName() + ": Create GL context FAILED obj " + toHexString(hashCode()) + ", for " + getClass().getName());
+                System.err.println(getThreadName() + ": Create GL context FAILED obj " + toHexString(hashCode()) + ", surf "+toHexString(drawable.getHandle())+" for " + getClass().getName());
             }
         }
         if(!created) {
@@ -1296,12 +1297,21 @@ public abstract class GLContextImpl extends GLContext {
         }
         quirks[i++] = quirk;
     }
-    if( glRendererLowerCase.contains("intel(r)") && glRendererLowerCase.contains("mesa") ) {
-        final int quirk = GLRendererQuirks.NoDoubleBufferedPBuffer;
-        if(DEBUG) {
-            System.err.println("Quirk: "+GLRendererQuirks.toString(quirk)+": cause: Renderer " + glRenderer);
+    if( glRendererLowerCase.contains("mesa") ) {
+        {
+            final int quirk = GLRendererQuirks.NoSetSwapIntervalPostRetarget;
+            if(DEBUG) {
+                System.err.println("Quirk: "+GLRendererQuirks.toString(quirk)+": cause: Renderer " + glRenderer);
+            }
+            quirks[i++] = quirk;            
+        }
+        if( glRendererLowerCase.contains("intel(r)") ) {
+            final int quirk = GLRendererQuirks.NoDoubleBufferedPBuffer;
+            if(DEBUG) {
+                System.err.println("Quirk: "+GLRendererQuirks.toString(quirk)+": cause: Renderer " + glRenderer);
+            }
+            quirks[i++] = quirk;
         }
-        quirks[i++] = quirk;
     }
     glRendererQuirks = new GLRendererQuirks(quirks, 0, i);
   }
diff --git a/src/jogl/classes/jogamp/opengl/x11/glx/X11GLXContext.java b/src/jogl/classes/jogamp/opengl/x11/glx/X11GLXContext.java
index d1801d8f8..e1330eb52 100644
--- a/src/jogl/classes/jogamp/opengl/x11/glx/X11GLXContext.java
+++ b/src/jogl/classes/jogamp/opengl/x11/glx/X11GLXContext.java
@@ -245,7 +245,6 @@ public abstract class X11GLXContext extends GLContextImpl {
         // hence we need to catch the X11 Error within this block.
         X11Util.setX11ErrorHandler(true, DEBUG ? false : true); // make sure X11 error handler is set
         ctx = _glXExt.glXCreateContextAttribsARB(display, config.getFBConfig(), share, direct, attribs);
-        if(DEBUG) { X11Lib.XSync(display, false); }
     } catch (RuntimeException re) {
         if(DEBUG) {
           Throwable t = new Throwable(getThreadName()+": Info: X11GLXContext.createContextARBImpl glXCreateContextAttribsARB failed with "+getGLVersion(major, minor, ctp, "@creation"), re);
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestGLContextDrawableSwitchNEWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestGLContextDrawableSwitchNEWT.java
index 4c1130498..496be3d93 100644
--- a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestGLContextDrawableSwitchNEWT.java
+++ b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestGLContextDrawableSwitchNEWT.java
@@ -124,8 +124,8 @@ public class TestGLContextDrawableSwitchNEWT extends UITestCase {
     public void testSwitch2WindowSingleContext() throws InterruptedException {
         final QuitAdapter quitAdapter = new QuitAdapter();
         
-        GLAutoDrawable glad1 = createGLAutoDrawable(caps,         64, 64,     width,     height, quitAdapter); // no GLContext!
-        GLAutoDrawable glad2 = createGLAutoDrawable(caps, 2*64+width, 64, width+100, height+100, quitAdapter); // no GLContext!
+        GLAutoDrawable glad1 = createGLAutoDrawable(caps,         64, 64,     width,     height, quitAdapter);
+        GLAutoDrawable glad2 = createGLAutoDrawable(caps, 2*64+width, 64, width+100, height+100, quitAdapter);
         
         // create single context using glad1 and assign it to glad1,
         // after destroying the prev. context!
@@ -159,15 +159,22 @@ public class TestGLContextDrawableSwitchNEWT extends UITestCase {
                 System.err.println(s+" - switch - START "+ ( t1 - t0 ));
                 animator.pause();
 
+                // switch context _and_ the demo synchronously
                 if(0 == s%2) {
-                    glad1.addGLEventListener(0, glad2.removeGLEventListener(0));
+                    final GLEventListener demo = glad2.removeGLEventListener(0);
                     GLContext ctx1 = glad1.setContext(glad2.getContext());
                     glad2.setContext(ctx1);
+                    glad1.addGLEventListener(0, demo);
                 } else {
-                    glad2.addGLEventListener(0, glad1.removeGLEventListener(0));
+                    final GLEventListener demo = glad1.removeGLEventListener(0);
                     GLContext ctx2 = glad2.setContext(glad1.getContext());                    
                     glad1.setContext(ctx2);
+                    glad2.addGLEventListener(0, demo);
                 }
+                System.err.println(s+" - switch - display-1");
+                glad1.display();
+                System.err.println(s+" - switch - display-2");
+                glad2.display();
                 
                 System.err.println(s+" - switch - END "+ ( t1 - t0 ));
                 
@@ -218,13 +225,16 @@ public class TestGLContextDrawableSwitchNEWT extends UITestCase {
                 System.err.println(s+" - switch - START "+ ( t1 - t0 ));
                 animator.pause();
 
+                // switch context _and_ the demo synchronously
                 if(0 == s%2) {
-                    glWindow1.addGLEventListener(0, glWindow2.removeGLEventListener(0));
+                    final GLEventListener demo = glWindow2.removeGLEventListener(0);
                     GLContext ctx1 = glWindow1.setContext(glWindow2.getContext());
+                    glWindow1.addGLEventListener(0, demo);
                     glWindow2.setContext(ctx1);
                 } else {
-                    glWindow2.addGLEventListener(0, glWindow1.removeGLEventListener(0));
+                    final GLEventListener demo = glWindow1.removeGLEventListener(0);
                     GLContext ctx2 = glWindow2.setContext(glWindow1.getContext());                    
+                    glWindow2.addGLEventListener(0, demo);
                     glWindow1.setContext(ctx2);
                 }