From 92d2a78f8d2d56cfadb4cb5323adec32fe73e353 Mon Sep 17 00:00:00 2001 From: Kristian Høgsberg Date: Sat, 8 Mar 2008 20:34:24 -0500 Subject: Introduce __GLXDRIscreen so we can start moving function pointers in there. Temporarily rename the __DRIscreen member to __driScreen. Eventually, we'll move that into __GLXDRIscreen and only access it in dri_glx.c. --- src/glx/x11/glxext.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'src/glx/x11/glxext.c') diff --git a/src/glx/x11/glxext.c b/src/glx/x11/glxext.c index f71c049acd..372dbfca65 100644 --- a/src/glx/x11/glxext.c +++ b/src/glx/x11/glxext.c @@ -349,7 +349,7 @@ static void FreeScreenConfigs(__GLXdisplayPrivate *priv) Xfree((char*) psc->serverGLXexts); #ifdef GLX_DIRECT_RENDERING - psc->driDestroyScreen(psc); + psc->driScreen->destroyScreen(psc); #endif } XFree((char*) priv->screenConfigs); @@ -772,7 +772,7 @@ static Bool AllocAndFetchScreenConfigs(Display *dpy, __GLXdisplayPrivate *priv) psc->scr = i; psc->dpy = dpy; #ifdef GLX_DIRECT_RENDERING - (*priv->driDisplay->createScreen)(psc, i, priv); + psc->driScreen = (*priv->driDisplay->createScreen)(psc, i, priv); #endif } SyncHandle(); @@ -1206,12 +1206,12 @@ FetchDRIDrawable( Display *dpy, GLXDrawable drawable, GLXContext gc) /* Create a new drawable */ pdraw->driDrawable.private = - (*sc->driScreen.createNewDrawable)(&sc->driScreen, - gc->mode, - &pdraw->driDrawable, - hwDrawable, - GLX_WINDOW_BIT, - empty_attribute_list); + (*sc->__driScreen.createNewDrawable)(&sc->__driScreen, + gc->mode, + &pdraw->driDrawable, + hwDrawable, + GLX_WINDOW_BIT, + empty_attribute_list); if (!pdraw->driDrawable.private) { XF86DRIDestroyDrawable(dpy, sc->scr, drawable); -- cgit v1.2.3