summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2012-10-01 13:06:42 +0100
committerChris Wilson <chris@chris-wilson.co.uk>2012-10-01 13:06:42 +0100
commit51202798862c79ad417936cfe2d1847b1da4ab87 (patch)
treee9c80d863f9756836b6d66ef1593509852ccc0f6
parentba1dea5e373b8d7b410c07df897acc4d11079f63 (diff)
uxa: Remove USE_GLAMOR check from unrealize glyph caches
In an interesting twist during teardown, the driver info structure is freed long before the caches. However, the glyph cache teardown was checking to see if glamor was enabled to see if it could skip the teardown. In fact, since we won't have created the glyph caches in that circumstances it was safe any way. Reported-by: Maarten Lankhorst <m.b.lankhorst@gmail.com> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
-rw-r--r--uxa/uxa-glyphs.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/uxa/uxa-glyphs.c b/uxa/uxa-glyphs.c
index 527942ad..f5d4d08b 100644
--- a/uxa/uxa-glyphs.c
+++ b/uxa/uxa-glyphs.c
@@ -112,9 +112,6 @@ static void uxa_unrealize_glyph_caches(ScreenPtr pScreen)
uxa_screen_t *uxa_screen = uxa_get_screen(pScreen);
int i;
- if (uxa_screen->info->flags & UXA_USE_GLAMOR)
- return;
-
if (!uxa_screen->glyph_cache_initialized)
return;