frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

If caller is not using glamor screen, we can't register 

the block handler.

Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
This commit is contained in:
Zhigang Gong 2011-11-15 20:17:18 +08:00 committed by Eric Anholt
parent 9ff39e53eb
commit 90eaac96ae
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
glamor/glamor.c
View File

@ -334,16 +334,16 @@ glamor_init(ScreenPtr screen, unsigned int flags)
glamor_priv->dispatch.glGetIntegerv(GL_MAX_RENDERBUFFER_SIZE, glamor_priv->dispatch.glGetIntegerv(GL_MAX_RENDERBUFFER_SIZE,
&glamor_priv->max_fbo_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); glamor_set_debug_level(&glamor_debug_level);
if (flags & GLAMOR_USE_SCREEN) { 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; glamor_priv->saved_close_screen = screen->CloseScreen;
screen->CloseScreen = glamor_close_screen; screen->CloseScreen = glamor_close_screen;