From 12b2adaaeb091ad48825f439fa0359e5641c86d1 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Sat, 28 Dec 2013 13:46:17 -0800 Subject: glamor: Do glyph private init at screeninit time, and other stuff at CSR. This hasn't actually been a problem, since the server hasn't allocated any glyphs before our glyph private initialization during CreateScreenResources. But it's generally not X Server style to do things this way. Now that glamor itself drives both parts of glyphs setup, DDX drivers no longer need to tell glamor to initialize glyphs. We do retain the old public symbol so they can keep running with no changes. Signed-off-by: Eric Anholt Reviewed-by: Markus Wick --- hw/kdrive/ephyr/hostx.c | 3 --- 1 file changed, 3 deletions(-) (limited to 'hw') diff --git a/hw/kdrive/ephyr/hostx.c b/hw/kdrive/ephyr/hostx.c index 0a9eb4696..3260d9527 100644 --- a/hw/kdrive/ephyr/hostx.c +++ b/hw/kdrive/ephyr/hostx.c @@ -1243,9 +1243,6 @@ ephyr_glamor_create_screen_resources(ScreenPtr pScreen) if (!ephyr_glamor) return TRUE; - if (!glamor_glyphs_init(pScreen)) - return FALSE; - /* kdrive's fbSetupScreen() told mi to have * miCreateScreenResources() (which is called before this) make a * scratch pixmap wrapping ephyr-glamor's NULL -- cgit v1.2.3