Mesa (master): glx: Move __driContext field out of __GLXcontextRec

[Kristian Høgsberg]

Module: Mesa
Branch: master
Commit: f679640868ae6ef700d8672702c31ba2515220a7
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=f679640868ae6ef700d8672702c31ba2515220a7

Author: Kristian Høgsberg <krh at bitplanet.net>
Date:   Wed Jul 21 13:55:30 2010 -0400

glx: Move __driContext field out of __GLXcontextRec

---

 src/glx/dri2_glx.c  |    6 +++---
 src/glx/glxclient.h |    1 -
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/glx/dri2_glx.c b/src/glx/dri2_glx.c
index be8671d..6ce5ae6 100644
--- a/src/glx/dri2_glx.c
+++ b/src/glx/dri2_glx.c
@@ -168,7 +168,6 @@ dri2CreateContext(__GLXscreenConfigs *base,
    pcp->driContext =
       (*psc->dri2->createNewContext) (psc->driScreen,
                                       config->driConfig, shared, pcp);
-   gc->__driContext = pcp->driContext;
 
    if (pcp->driContext == NULL) {
       Xfree(pcp);
@@ -635,6 +634,7 @@ dri2_bind_tex_image(Display * dpy,
    struct dri2_display *pdp =
       (struct dri2_display *) dpyPriv->dri2Display;
    struct dri2_screen *psc = (struct dri2_screen *) base->psc;
+   struct dri2_context *pcp = (struct dri2_context *) gc->driContext;
 
    if (pdraw != NULL) {
 
@@ -645,13 +645,13 @@ dri2_bind_tex_image(Display * dpy,
 
       if (psc->texBuffer->base.version >= 2 &&
 	  psc->texBuffer->setTexBuffer2 != NULL) {
-	 (*psc->texBuffer->setTexBuffer2) (gc->__driContext,
+	 (*psc->texBuffer->setTexBuffer2) (pcp->driContext,
 					   pdraw->base.textureTarget,
 					   pdraw->base.textureFormat,
 					   pdraw->driDrawable);
       }
       else {
-	 (*psc->texBuffer->setTexBuffer) (gc->__driContext,
+	 (*psc->texBuffer->setTexBuffer) (pcp->driContext,
 					  pdraw->base.textureTarget,
 					  pdraw->driDrawable);
       }
diff --git a/src/glx/glxclient.h b/src/glx/glxclient.h
index f788b7a..67f69b8 100644
--- a/src/glx/glxclient.h
+++ b/src/glx/glxclient.h
@@ -418,7 +418,6 @@ struct __GLXcontextRec
    Bool do_destroy;
 #else
    __GLXDRIcontext *driContext;
-   __DRIcontext *__driContext;
 #endif
 #endif