[PATCH 3/4] present: remove invalid assert

Frank Binns frank.binns at imgtec.com
Thu Apr 24 02:39:00 PDT 2014


In the case that synchronised page flips are being performed, it's
possible to hit this assert when killing an application. This is a
result of the pending flip being flagged as aborted, as part of
window destruction, but the pending flip not being cleared until the
corresponding flip event has been received.

It doesn't appear that there is any problem with setting an aborted
pending flip's window to NULL. For this reason remove the assert.

Signed-off-by: Frank Binns <frank.binns at imgtec.com>
---
 present/present_screen.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/present/present_screen.c b/present/present_screen.c
index 693c827..50c25e8 100644
--- a/present/present_screen.c
+++ b/present/present_screen.c
@@ -94,10 +94,9 @@ present_clear_window_flip(WindowPtr window)
     present_screen_priv_ptr     screen_priv = present_screen_priv(screen);
     present_vblank_ptr          flip_pending = screen_priv->flip_pending;
 
-    if (flip_pending && flip_pending->window == window) {
-        assert (flip_pending->abort_flip);
+    if (flip_pending && flip_pending->window == window)
         flip_pending->window = NULL;
-    }
+
     if (screen_priv->flip_window == window)
         screen_priv->flip_window = NULL;
 }
-- 
1.8.5.4.gfdaaaa2



More information about the xorg-devel mailing list