removed MakeCurrent short-circuit code to fix BadContextTag errors when mixing direct/indirect renderingglxmisc-2-0-0-20000503glxmisc-2-0-0-branch

3 files changed, 0 insertions, 9 deletions

diff --git a/xc/lib/GL/mesa/src/drv/i810/i810_xmesa.c b/xc/lib/GL/mesa/src/drv/i810/i810_xmesa.c
index eaeeaaecd..4cdbe4c7a 100644
--- a/xc/lib/GL/mesa/src/drv/i810/i810_xmesa.c
+++ b/xc/lib/GL/mesa/src/drv/i810/i810_xmesa.c
@@ -480,9 +480,6 @@ GLboolean XMesaMakeCurrent(__DRIcontextPrivate *driContextPriv,
                            __DRIdrawablePrivate *driDrawPriv,
                            __DRIdrawablePrivate *driReadPriv)
 {
-   if (driContextPriv->driverPrivate==(void *)i810Ctx)
-      return GL_TRUE;
-
    if (driContextPriv) {
       i810Ctx = (i810ContextPtr) driContextPriv->driverPrivate;
 
diff --git a/xc/lib/GL/mesa/src/drv/mga/mga_xmesa.c b/xc/lib/GL/mesa/src/drv/mga/mga_xmesa.c
index f24d35d2d..b3eaa6376 100644
--- a/xc/lib/GL/mesa/src/drv/mga/mga_xmesa.c
+++ b/xc/lib/GL/mesa/src/drv/mga/mga_xmesa.c
@@ -378,9 +378,6 @@ GLboolean XMesaMakeCurrent(__DRIcontextPrivate *driContextPriv,
                            __DRIdrawablePrivate *driReadPriv)
 {
    if (driContextPriv) {
-      if (driContextPriv->driverPrivate == (void *)mgaCtx)
-         return GL_TRUE;
-
       mgaCtx = (mgaContextPtr) driContextPriv->driverPrivate;
 
       gl_make_current2(mgaCtx->glCtx, driDrawPriv->mesaBuffer, driReadPriv->mesaBuffer);
diff --git a/xc/lib/GL/mesa/src/drv/tdfx/tdfx_xmesa.c b/xc/lib/GL/mesa/src/drv/tdfx/tdfx_xmesa.c
index aa3d50aea..e99c57a07 100644
--- a/xc/lib/GL/mesa/src/drv/tdfx/tdfx_xmesa.c
+++ b/xc/lib/GL/mesa/src/drv/tdfx/tdfx_xmesa.c
@@ -242,9 +242,6 @@ GLboolean XMesaMakeCurrent(__DRIcontextPrivate *driContextPriv,
   if (driContextPriv) {
     tdfxContextPrivate *gCCPriv;
 
-    if (driContextPriv == gCC)
-      return GL_TRUE;
-
     gCC = driContextPriv;
     gCCPriv = (tdfxContextPrivate *)driContextPriv->driverPrivate;