From 31819830b66a49f1b62e09090cc65aefc657aeb8 Mon Sep 17 00:00:00 2001
From: Kristian Høgsberg <krh@bitplanet.net>
Date: Thu, 22 Jul 2010 21:24:14 -0400
Subject: glx: Allocate the __GLXcontext in the DRI drivers

---
 src/glx/glxcurrent.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'src/glx/glxcurrent.c')

diff --git a/src/glx/glxcurrent.c b/src/glx/glxcurrent.c
index 43469c371c..0bf61779c4 100644
--- a/src/glx/glxcurrent.c
+++ b/src/glx/glxcurrent.c
@@ -399,7 +399,7 @@ MakeContextCurrent(Display * dpy, GLXDrawable draw,
       }
 
       bindReturnValue =
-         (gc->driContext->bindContext) (gc->driContext, pdraw, pread);
+         (gc->driContext->bindContext) (gc, pdraw, pread);
    }
    else if (!gc && oldGC && oldGC->driContext) {
       bindReturnValue = True;
@@ -441,7 +441,7 @@ MakeContextCurrent(Display * dpy, GLXDrawable draw,
    }
 #if defined(GLX_DIRECT_RENDERING) && !defined(GLX_USE_APPLEGL)
    else if (oldGC->driContext && oldGC != gc) {
-      oldGC->driContext->unbindContext(oldGC->driContext);
+      oldGC->driContext->unbindContext(oldGC);
    }
 #endif
 
@@ -488,9 +488,7 @@ MakeContextCurrent(Display * dpy, GLXDrawable draw,
 #if defined(GLX_DIRECT_RENDERING) && !defined(GLX_USE_APPLEGL)
             /* Destroy the old direct rendering context */
             if (oldGC->driContext) {
-               oldGC->driContext->destroyContext(oldGC->driContext,
-                                                 oldGC->psc,
-                                                 oldGC->createDpy);
+               oldGC->driContext->destroyContext(oldGC);
                oldGC->driContext = NULL;
             }
 #endif
-- 
cgit v1.2.3