diff options
| author | Roman Gilg <subdiff@gmail.com> | 2020-07-14 14:32:25 +0200 |
|---|---|---|
| committer | Roman Gilg <subdiff@gmail.com> | 2020-07-22 11:10:17 +0200 |
| commit | bf794bd7bfa3bdcf7de95ce237eb50ecc6ec11d2 (patch) | |
| tree | 41dc1c3c7be3bee5eababb724734082d2658b701 | |
| parent | ab880b8b9e8d67a05fcb085097c94bbddf7dcb95 (diff) | |
present: Remove superfluous set abort flip function in window mode
The function is never called from present_screen.c in contrast to the behavior
in screen mode.
In present_wnmd.c we can simply remove the function which does an unnecessary
check of the property before setting it and directly set the property at the
two locations the function was called previously.
Signed-off-by: Roman Gilg <subdiff@gmail.com>
| -rw-r--r-- | present/present_priv.h | 3 | ||||
| -rw-r--r-- | present/present_wnmd.c | 14 |
2 files changed, 2 insertions, 15 deletions
diff --git a/present/present_priv.h b/present/present_priv.h index 2bd6b4062..dabf4c9d0 100644 --- a/present/present_priv.h +++ b/present/present_priv.h @@ -482,9 +482,6 @@ present_vblank_destroy(present_vblank_ptr vblank); * present_wnmd.c */ void -present_wnmd_set_abort_flip(WindowPtr window); - -void present_wnmd_init_mode_hooks(present_screen_priv_ptr screen_priv); #endif /* _PRESENT_PRIV_H_ */ diff --git a/present/present_wnmd.c b/present/present_wnmd.c index 37f1f84f6..23a8863fc 100644 --- a/present/present_wnmd.c +++ b/present/present_wnmd.c @@ -138,16 +138,6 @@ present_wnmd_toplvl_pixmap_window(WindowPtr window) return w; } -void -present_wnmd_set_abort_flip(WindowPtr window) -{ - present_window_priv_ptr window_priv = present_window_priv(window); - - if (!window_priv->flip_pending->abort_flip) { - window_priv->flip_pending->abort_flip = TRUE; - } -} - static void present_wnmd_flips_stop(WindowPtr window) { @@ -352,7 +342,7 @@ present_wnmd_check_flip_window (WindowPtr window) if (flip_pending) { if (!present_wnmd_check_flip(flip_pending->crtc, flip_pending->window, flip_pending->pixmap, flip_pending->sync_flip, NULL, 0, 0, NULL)) - present_wnmd_set_abort_flip(window); + window_priv->flip_pending->abort_flip = TRUE; } else if (flip_active) { if (!present_wnmd_check_flip(flip_active->crtc, flip_active->window, flip_active->pixmap, flip_active->sync_flip, NULL, 0, 0, NULL)) @@ -399,7 +389,7 @@ present_wnmd_cancel_flip(WindowPtr window) present_window_priv_ptr window_priv = present_window_priv(window); if (window_priv->flip_pending) - present_wnmd_set_abort_flip(window); + window_priv->flip_pending->abort_flip = TRUE; else if (window_priv->flip_active) present_wnmd_flips_stop(window); } |