hashirama/xserver
Watch
0
0
Fork
You've already forked xserver
 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-09-26 21:12:25 +00:00
Code Issues Projects Releases Wiki Activity

glamor_init: Should set gl_flavor before sub-module intialization.

Browse source 
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
This commit is contained in:
Zhigang Gong 2012-01-20 10:55:16 +08:00 • committed by Eric Anholt
commit c244969b33
1 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
glamor/glamor.c
View file

@ -318,6 +318,12 @@ glamor_init(ScreenPtr screen, unsigned int flags)
glamor_set_debug_level(&glamor_debug_level); 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 (flags & GLAMOR_USE_SCREEN) {
if (!RegisterBlockAndWakeupHandlers(_glamor_block_handler, if (!RegisterBlockAndWakeupHandlers(_glamor_block_handler,
_glamor_wakeup_handler, _glamor_wakeup_handler,
@ -390,11 +396,6 @@ glamor_init(ScreenPtr screen, unsigned int flags)
glamor_init_finish_access_shaders(screen); glamor_init_finish_access_shaders(screen);
glamor_pixmap_init(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; glamor_priv->flags = flags;
return TRUE; return TRUE;