Mesa (master): glx: Drop duplicate psc field in dri context struct

[Kristian Høgsberg]

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

Author: Kristian Høgsberg <krh at bitplanet.net>
Date:   Mon Jul 26 15:17:00 2010 -0400

glx: Drop duplicate psc field in dri context struct

Same problem as fixed for drisw in 4d58b5b482d06ab8d4c4b2db33d0b48b7c82d064.

---

 src/glx/dri_glx.c |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/glx/dri_glx.c b/src/glx/dri_glx.c
index eaf8e3b..fd14285 100644
--- a/src/glx/dri_glx.c
+++ b/src/glx/dri_glx.c
@@ -82,7 +82,6 @@ struct dri_context
    __GLXDRIcontext dri_vtable;
    __DRIcontext *driContext;
    XID hwContextID;
-   __GLXscreenConfigs *psc;
 };
 
 struct dri_drawable
@@ -524,7 +523,7 @@ driBindContext(__GLXcontext *context,
 	       __GLXDRIdrawable *draw, __GLXDRIdrawable *read)
 {
    struct dri_context *pcp = (struct dri_context *) context;
-   struct dri_screen *psc = (struct dri_screen *) pcp->psc;
+   struct dri_screen *psc = (struct dri_screen *) pcp->base.psc;
    struct dri_drawable *pdr = (struct dri_drawable *) draw;
    struct dri_drawable *prd = (struct dri_drawable *) read;
 
@@ -536,7 +535,7 @@ static void
 driUnbindContext(__GLXcontext * context)
 {
    struct dri_context *pcp = (struct dri_context *) context;
-   struct dri_screen *psc = (struct dri_screen *) pcp->psc;
+   struct dri_screen *psc = (struct dri_screen *) pcp->base.psc;
 
    (*psc->core->unbindContext) (pcp->driContext);
 }