1 files changed, 2 insertions, 0 deletions
diff --git a/xorg-server/hw/xwin/swrastwgl_dri/swrastwgl_dri.c b/xorg-server/hw/xwin/swrastwgl_dri/swrastwgl_dri.c
index 1be5e2caf..4c20c09ab 100644
--- a/xorg-server/hw/xwin/swrastwgl_dri/swrastwgl_dri.c
+++ b/xorg-server/hw/xwin/swrastwgl_dri/swrastwgl_dri.c
@@ -1053,6 +1053,7 @@ static int driBindContext(__DRIcontext *pcp, __DRIdrawable *pdp, __DRIdrawable *
       wglResolveExtensionProcs();
     }
     current_pcp=pcp;
+    _glapi_set_dispatch(pcp->Dispatch);
   }
 
   return GL_TRUE;
@@ -1110,6 +1111,7 @@ static int driUnbindContext(__DRIcontext *pcp)
 
   pcp->driDrawablePriv = NULL;
   pcp->driReadablePriv = NULL;
+  _glapi_set_dispatch(NULL);
 
   return GL_TRUE;
 }