From 4d58b5b482d06ab8d4c4b2db33d0b48b7c82d064 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Kristian=20H=C3=B8gsberg?= Date: Sat, 24 Jul 2010 21:43:25 -0400 Subject: [PATCH] glx: Drop duplicate psc field in drisw context struct Causing a crash in drisw MakeCurrent. --- src/glx/drisw_glx.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/glx/drisw_glx.c b/src/glx/drisw_glx.c index 11f88e96703..5f7185de4c8 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); } -- 2.30.2