[Glamor] [PATCH 09/15] glamor_init: Should set gl_flavor before sub-module intialization.

[zhigang.gong at linux.intel.com]

From: Zhigang Gong <zhigang.gong at linux.intel.com>

Signed-off-by: Zhigang Gong <zhigang.gong at linux.intel.com>
---
 src/glamor.c |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/glamor.c b/src/glamor.c
index 1599b83..00c6714 100644
--- a/src/glamor.c
+++ b/src/glamor.c
@@ -315,6 +315,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,
@@ -387,11 +393,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;
-- 
1.7.4.4