diff options
author | Alan Hourihane <alanh@tungstengraphics.com> | 2007-09-28 21:22:28 +0100 |
---|---|---|
committer | Alan Hourihane <alanh@tungstengraphics.com> | 2007-10-15 19:04:19 +0100 |
commit | a03a652840030895069a1c0ff973f3f7b13f6b7d (patch) | |
tree | b149b30830b37ca33acc1e4f38657fa1a72ba7e0 | |
parent | 498020054a9d0abd085fe030c5627f6b5cbd8a58 (diff) |
Cleanup destruction - fixes Xserver exiting crash.
-rw-r--r-- | glucose/glucose.c | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/glucose/glucose.c b/glucose/glucose.c index e3fe990d5..1b9b3f037 100644 --- a/glucose/glucose.c +++ b/glucose/glucose.c @@ -124,14 +124,6 @@ glucoseCreateScreenResources(ScreenPtr pScreen) __pGlxClient = serverClient; - /* track root pixmap */ - if (pPixmap) - { - pPixmap->drawable.serialNumber = NEXT_SERIAL_NUMBER; - pPixmap->drawable.id = FakeClientID(0); - AddResource(pPixmap->drawable.id, RT_PIXMAP, (pointer)pPixmap); - } - pScreenPriv->rootDrawable = pScreenPriv->screen->createDrawable(pScreenPriv->screen, (DrawablePtr)pPixmap, pPixmap->drawable.id, modes); if (!pScreenPriv->rootDrawable) { @@ -726,19 +718,6 @@ glucoseCloseScreen (int index, if (pPixmapPriv->pDamage) DamageDestroy (pPixmapPriv->pDamage); - if (pScreenPriv->surface) - glitz_surface_destroy (pScreenPriv->surface); - pPixmapPriv->surface = NULL; - pScreenPriv->surface = NULL; - - GEOMETRY_UNINIT (&pScreenPriv->scratchGeometry); - - if (pScreenPriv->drawable) - glitz_drawable_destroy(pScreenPriv->drawable); - pPixmapPriv->drawable = NULL; - pScreenPriv->drawable = NULL; - xglScreenInfo.drawable = NULL; - while (pScreenPriv->pVisual) { v = pScreenPriv->pVisual; |