--- glxext.c-orig	2006-10-14 10:15:12.000000000 -0700
+++ glxext.c	2006-10-14 11:36:24.000000000 -0700
@@ -1601,6 +1601,9 @@
     _glapi_check_multithread();
 
 #ifdef GLX_DIRECT_RENDERING
+    if (oldGC->isDirect)
+        oldGC->currentContextTag = 0;
+
     /* Bind the direct rendering context to the drawable */
     if (gc && gc->isDirect) {
 	bindReturnValue = (gc->driContext.private)