andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

present: Factor code for restoring screen pixmap out of present_unflip (v2)

Browse Source 
The following fix will use the refactored function.

The logic in the refactored function is slightly simplified, exploiting
the fact that this function is only ever called with a valid flip
pixmap.

v2: Assert that flip_pixmap is non-NULL instead of testing and bailing
    on NULL, preserve test for flip_window being non-NULL before calling
    present_set_tree_pixmap for it (Keith Packard)

Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> (v1)
Reviewed-by: Keith Packard <keithp@keithp.com>
This commit is contained in:
Michel Dänzer 2016-02-18 17:20:45 +09:00 committed by Michel Dänzer
parent 72328e5eb9
commit 4611e902c2
1 changed files with 23 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
present/present.c
View File

@ -413,6 +413,28 @@ present_set_tree_pixmap(WindowPtr window,
TraverseTree(window, present_set_tree_pixmap_visit, &visit);
}
static void
present_restore_screen_pixmap(ScreenPtr screen)
{
present_screen_priv_ptr screen_priv = present_screen_priv(screen);
PixmapPtr screen_pixmap = (*screen->GetScreenPixmap)(screen);
PixmapPtr flip_pixmap = screen_priv->flip_pixmap;
WindowPtr flip_window = screen_priv->flip_window;
assert (flip_pixmap);
/* Update the screen pixmap with the current flip pixmap contents
* Only do this the first time for a particular unflip operation, or
* we'll probably scribble over other windows
*/
if (screen->GetWindowPixmap(screen->root) == flip_pixmap)
present_copy_region(&screen_pixmap->drawable, flip_pixmap, NULL, 0, 0);
if (flip_window)
present_set_tree_pixmap(flip_window, flip_pixmap, screen_pixmap);
present_set_tree_pixmap(screen->root, NULL, screen_pixmap);
}
static void
present_set_abort_flip(ScreenPtr screen)
{
@ -438,26 +460,11 @@ static void
present_unflip(ScreenPtr screen)
{
present_screen_priv_ptr screen_priv = present_screen_priv(screen);
PixmapPtr pixmap = (*screen->GetScreenPixmap)(screen);
assert (!screen_priv->unflip_event_id);
assert (!screen_priv->flip_pending);
/* Update the screen pixmap with the current flip pixmap contents
* Only do this the first time for a particular unflip operation, or
* we'll probably scribble over other windows
*/
if (screen->GetWindowPixmap(screen->root) == screen_priv->flip_pixmap) {
present_copy_region(&pixmap->drawable, screen_priv->flip_pixmap,
NULL, 0, 0);
}
if (screen_priv->flip_pixmap && screen_priv->flip_window)
present_set_tree_pixmap(screen_priv->flip_window,
screen_priv->flip_pixmap,
pixmap);
present_set_tree_pixmap(screen->root, NULL, pixmap);
present_restore_screen_pixmap(screen);
screen_priv->unflip_event_id = ++present_event_id;
DebugPresent(("u %lld\n", screen_priv->unflip_event_id));