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

[Kristian Høgsberg]

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

Author: Kristian Høgsberg <krh at bitplanet.net>
Date:   Sat Jul 24 21:43:25 2010 -0400

glx: Drop duplicate psc field in drisw context struct

Causing a crash in drisw MakeCurrent.

---

 src/glx/drisw_glx.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/glx/drisw_glx.c b/src/glx/drisw_glx.c
index 11f88e9..5f7185d 100644
--- a/src/glx/drisw_glx.c
+++ b/src/glx/drisw_glx.c
@@ -38,7 +38,7 @@ struct drisw_context
    __GLXcontext base;
    __GLXDRIcontext dri_vtable;
    __DRIcontext *driContext;
-   __GLXscreenConfigs *psc;
+
 };
 
 struct drisw_screen
@@ -263,7 +263,7 @@ driBindContext(__GLXcontext * context,
 	       __GLXDRIdrawable * draw, __GLXDRIdrawable * read)
 {
    struct drisw_context *pcp = (struct drisw_context *) context;
-   struct drisw_screen *psc = (struct drisw_screen *) pcp->psc;
+   struct drisw_screen *psc = (struct drisw_screen *) pcp->base.psc;
    struct drisw_drawable *pdr = (struct drisw_drawable *) draw;
    struct drisw_drawable *prd = (struct drisw_drawable *) read;
 
@@ -275,7 +275,7 @@ static void
 driUnbindContext(__GLXcontext * context)
 {
    struct drisw_context *pcp = (struct drisw_context *) context;
-   struct drisw_screen *psc = (struct drisw_screen *) pcp->psc;
+   struct drisw_screen *psc = (struct drisw_screen *) pcp->base.psc;
 
    (*psc->core->unbindContext) (pcp->driContext);
 }