diff options
| author | kem <kem> | 2001-01-11 16:20:37 +0000 |
|---|---|---|
| committer | kem <kem> | 2001-01-11 16:20:37 +0000 |
| commit | 1370184793a86cfd214fffa6d6c854d84acd8036 (patch) | |
| tree | 3153c3cfbafd3cc79ace27e404b2f8b1ef5e67f9 /xc/lib/GL | |
| parent | a19c1a93b53cbf37bc6ade7485fffd1c5337aeb1 (diff) | |
- Re-enable freeing resources when the screen is destroyed
Diffstat (limited to 'xc/lib/GL')
| -rw-r--r-- | xc/lib/GL/glx/glxext.c | 6 | ||||
| -rw-r--r-- | xc/lib/GL/mesa/dri/dri_mesa.c | 6 |
2 files changed, 9 insertions, 3 deletions
diff --git a/xc/lib/GL/glx/glxext.c b/xc/lib/GL/glx/glxext.c index 9dfe5a1c2..6287be5c5 100644 --- a/xc/lib/GL/glx/glxext.c +++ b/xc/lib/GL/glx/glxext.c @@ -33,8 +33,8 @@ ** published by SGI, but has not been independently verified as being ** compliant with the OpenGL(R) version 1.2.1 Specification. ** -** $Date: 2001/01/08 16:21:36 $ $Revision: 1.15 $ -** $Header: /home/ajax/dri-backup/xc/xc/lib/GL/glx/glxext.c,v 1.15 2001/01/08 16:21:36 nathanh Exp $ +** $Date: 2001/01/11 16:20:37 $ $Revision: 1.16 $ +** $Header: /home/ajax/dri-backup/xc/xc/lib/GL/glx/glxext.c,v 1.16 2001/01/11 16:20:37 kem Exp $ */ /* < @@ -228,7 +228,7 @@ static void FreeScreenConfigs(__GLXdisplayPrivate *priv) psc->configs = 0; /* NOTE: just for paranoia */ } -#if 0 /* GLX_DIRECT_RENDERING */ +#if GLX_DIRECT_RENDERING /* Free the direct rendering per screen data */ if (psc->driScreen.private) (*psc->driScreen.destroyScreen)(priv->dpy, i, diff --git a/xc/lib/GL/mesa/dri/dri_mesa.c b/xc/lib/GL/mesa/dri/dri_mesa.c index 91e1508a0..0257ef5b5 100644 --- a/xc/lib/GL/mesa/dri/dri_mesa.c +++ b/xc/lib/GL/mesa/dri/dri_mesa.c @@ -937,10 +937,16 @@ static void driMesaDestroyScreen(Display *dpy, int scrn, void *private) __DRIscreenPrivate *psp = (__DRIscreenPrivate *)private; if (psp) { +#if 0 + /* + ** NOT_DONE: For the same reason as that listed below, we cannot + ** call the X server here to destroy the dummy context. + */ if (psp->dummyContextPriv.driScreenPriv) { (void)XF86DRIDestroyContext(dpy, scrn, psp->dummyContextPriv.contextID); } +#endif if (psp->MesaAPI.ResetDriver) (*psp->MesaAPI.ResetDriver)(psp); while (--psp->numVisuals >= 0) { |