Index: src/glx/x11/glxext.c
===================================================================
RCS file: /cvs/mesa/Mesa/src/glx/x11/glxext.c,v
retrieving revision 1.29
diff -u -d -r1.29 glxext.c
--- src/glx/x11/glxext.c	9 Oct 2006 14:57:50 -0000	1.29
+++ src/glx/x11/glxext.c	16 Oct 2006 15:29:59 -0000
@@ -1612,7 +1612,7 @@
 	/* Send a glXMakeCurrent request to bind the new context. */
 	bindReturnValue = 
 	  SendMakeCurrentRequest(dpy, opcode, gc ? gc->xid : None,
-				 (dpy != oldGC->currentDpy) 
+				 ((dpy != oldGC->currentDpy) || oldGC->isDirect)
 				 ? None : oldGC->currentContextTag,
 				 draw, read, &reply);
     }