From c244969b331e08679be9a9618d75fe5ee9cc9d86 Mon Sep 17 00:00:00 2001 From: Zhigang Gong Date: Fri, 20 Jan 2012 10:55:16 +0800 Subject: [PATCH] glamor_init: Should set gl_flavor before sub-module intialization. Signed-off-by: Zhigang Gong --- glamor/glamor.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/glamor/glamor.c b/glamor/glamor.c index 6e843f437..51d04cde3 100644 --- a/glamor/glamor.c +++ b/glamor/glamor.c @@ -318,6 +318,12 @@ glamor_init(ScreenPtr screen, unsigned int flags) glamor_set_debug_level(&glamor_debug_level); +#ifdef GLAMOR_GLES2 + glamor_priv->gl_flavor = GLAMOR_GL_ES2; +#else + glamor_priv->gl_flavor = GLAMOR_GL_DESKTOP; +#endif + if (flags & GLAMOR_USE_SCREEN) { if (!RegisterBlockAndWakeupHandlers(_glamor_block_handler, _glamor_wakeup_handler, @@ -390,11 +396,6 @@ glamor_init(ScreenPtr screen, unsigned int flags) glamor_init_finish_access_shaders(screen); glamor_pixmap_init(screen); -#ifdef GLAMOR_GLES2 - glamor_priv->gl_flavor = GLAMOR_GL_ES2; -#else - glamor_priv->gl_flavor = GLAMOR_GL_DESKTOP; -#endif glamor_priv->flags = flags; return TRUE;