xserver: Branch 'server-1.16-branch'
Julien Cristau
jcristau at kemper.freedesktop.org
Wed Oct 29 04:28:04 PDT 2014
present/present.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 27600a6b2056b8cf6af8b6b0f078164ef36c0767
Author: Axel Davy <axel.davy at ens.fr>
Date: Sat Sep 27 23:17:13 2014 +0200
Fix present_pixmap when using present_notify_msc
Calling present_notify_msc could cancel a pending pixmap presentation.
Signed-off-by: Axel Davy <axel.davy at ens.fr>
Reviewed-by: Keith Packard <keithp at keithp.com>
Signed-off-by: Keith Packard <keithp at keithp.com>
(cherry picked from commit 9bc01dfc7070a40f5948588895b3a11dd1636d0e)
Signed-off-by: Julien Cristau <jcristau at debian.org>
diff --git a/present/present.c b/present/present.c
index 3aea0d7..4596c4a 100644
--- a/present/present.c
+++ b/present/present.c
@@ -762,7 +762,7 @@ present_pixmap(WindowPtr window,
* in the same frame
*/
- if (!update) {
+ if (!update && pixmap) {
xorg_list_for_each_entry_safe(vblank, tmp, &window_priv->vblank, window_list) {
if (!vblank->pixmap)
More information about the xorg-commit
mailing list