diff options
| author | Kristian Høgsberg <krh@bitplanet.net> | 2010-07-19 16:45:23 -0400 |
|---|---|---|
| committer | Kristian Høgsberg <krh@bitplanet.net> | 2010-07-19 22:45:50 -0400 |
| commit | 70887d517290060a80c7f5dd8c0ea0c834c4d91e (patch) | |
| tree | 382324fe11facbb2ec4258e79001977272f8fe62 /src/glx/dri_glx.c | |
| parent | 089fc37c6fa158824279e08e3b378ced94d6f803 (diff) | |
glx: Move __driScreen into the dri screen privates
Diffstat (limited to 'src/glx/dri_glx.c')
| -rw-r--r-- | src/glx/dri_glx.c | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/src/glx/dri_glx.c b/src/glx/dri_glx.c index 42d5994b2e2..373f9fb649d 100644 --- a/src/glx/dri_glx.c +++ b/src/glx/dri_glx.c @@ -63,7 +63,8 @@ struct dri_screen { __GLXscreenConfigs base; - __GLXDRIscreen driScreen; + __DRIscreen *driScreen; + __GLXDRIscreen vtable; const __DRIlegacyExtension *legacy; const __DRIcoreExtension *core; const __DRIswapControlExtension *swapControl; @@ -551,7 +552,7 @@ driCreateContext(__GLXscreenConfigs *base, } pcp->driContext = - (*psc->legacy->createNewContext) (psc->base.__driScreen, + (*psc->legacy->createNewContext) (psc->driScreen, config->driConfig, renderType, shared, hwContext, pcp); if (pcp->driContext == NULL) { @@ -607,7 +608,7 @@ driCreateDrawable(__GLXscreenConfigs *base, /* Create a new drawable */ pdraw->driDrawable = - (*psc->legacy->createNewDrawable) (psc->base.__driScreen, + (*psc->legacy->createNewDrawable) (psc->driScreen, config->driConfig, hwDrawable, GLX_WINDOW_BIT, @@ -648,9 +649,9 @@ driDestroyScreen(__GLXscreenConfigs *base) struct dri_screen *psc = (struct dri_screen *) base; /* Free the direct rendering per screen data */ - if (psc->base.__driScreen) - (*psc->core->destroyScreen) (psc->base.__driScreen); - psc->base.__driScreen = NULL; + if (psc->driScreen) + (*psc->core->destroyScreen) (psc->driScreen); + psc->driScreen = NULL; if (psc->driver) dlclose(psc->driver); } @@ -820,19 +821,19 @@ driCreateScreen(int screen, __GLXdisplayPrivate *priv) } pdp = (struct dri_display *) priv->driDisplay; - psc->base.__driScreen = + psc->driScreen = CallCreateNewScreen(psc->base.dpy, screen, psc, pdp); - if (psc->base.__driScreen == NULL) { + if (psc->driScreen == NULL) { dlclose(psc->driver); Xfree(psc); return NULL; } - extensions = psc->core->getExtensions(psc->base.__driScreen); + extensions = psc->core->getExtensions(psc->driScreen); driBindExtensions(psc, extensions); driBindCommonExtensions(&psc->base, extensions); - psp = &psc->driScreen; + psp = &psc->vtable; psc->base.driScreen = psp; if (psc->base.driCopySubBuffer) psp->copySubBuffer = driCopySubBuffer; |