From 90eaac96aeb53b3e45b82dc7dd4e98778c8c9343 Mon Sep 17 00:00:00 2001 From: Zhigang Gong Date: Tue, 15 Nov 2011 20:17:18 +0800 Subject: [PATCH] If caller is not using glamor screen, we can't register the block handler. Signed-off-by: Zhigang Gong --- glamor/glamor.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/glamor/glamor.c b/glamor/glamor.c index c96795ced..b660f95e9 100644 --- a/glamor/glamor.c +++ b/glamor/glamor.c @@ -334,16 +334,16 @@ glamor_init(ScreenPtr screen, unsigned int flags) glamor_priv->dispatch.glGetIntegerv(GL_MAX_RENDERBUFFER_SIZE, &glamor_priv->max_fbo_size); - if (!RegisterBlockAndWakeupHandlers(_glamor_block_handler, - _glamor_wakeup_handler, - (void *) - &glamor_priv->dispatch)) { - goto fail; - } - glamor_set_debug_level(&glamor_debug_level); if (flags & GLAMOR_USE_SCREEN) { + if (!RegisterBlockAndWakeupHandlers(_glamor_block_handler, + _glamor_wakeup_handler, + (void *) + &glamor_priv->dispatch)) { + goto fail; + } + glamor_priv->saved_close_screen = screen->CloseScreen; screen->CloseScreen = glamor_close_screen;