xserver: Branch 'server-1.20-branch'
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Wed Jul 10 15:14:36 UTC 2019
present/present_scmd.c | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
New commits:
commit 26b6ba5347953ed5f60b7fb9454b45754b145c6f
Author: Michel Dänzer <michel.daenzer at amd.com>
Date: Wed Jul 3 11:53:56 2019 +0200
Revert "present/scmd: Check that the flip and screen pixmap pitches match"
This reverts commit ef91da2757050652c724f6e674e8b1acf5d0cb31.
I thought this couldn't work under any circumstances, but I was wrong,
and drivers are already checking for cases that really cannot work.
Fixes issue #839.
(cherry picked from commit 2f0dd1816d556eef8c4b691330d39f13e1ed93f0)
diff --git a/present/present_scmd.c b/present/present_scmd.c
index 3b7fbd832..6a580cb7a 100644
--- a/present/present_scmd.c
+++ b/present/present_scmd.c
@@ -78,7 +78,7 @@ present_check_flip(RRCrtcPtr crtc,
PresentFlipReason *reason)
{
ScreenPtr screen = window->drawable.pScreen;
- PixmapPtr screen_pixmap, window_pixmap;
+ PixmapPtr window_pixmap;
WindowPtr root = screen->root;
present_screen_priv_ptr screen_priv = present_screen_priv(screen);
@@ -99,9 +99,8 @@ present_check_flip(RRCrtcPtr crtc,
return FALSE;
/* Make sure the window hasn't been redirected with Composite */
- screen_pixmap = screen->GetScreenPixmap(screen);
window_pixmap = screen->GetWindowPixmap(window);
- if (window_pixmap != screen_pixmap &&
+ if (window_pixmap != screen->GetScreenPixmap(screen) &&
window_pixmap != screen_priv->flip_pixmap &&
window_pixmap != present_flip_pending_pixmap(screen))
return FALSE;
@@ -127,8 +126,7 @@ present_check_flip(RRCrtcPtr crtc,
window->drawable.x != pixmap->screen_x || window->drawable.y != pixmap->screen_y ||
#endif
window->drawable.width != pixmap->drawable.width ||
- window->drawable.height != pixmap->drawable.height ||
- pixmap->devKind != screen_pixmap->devKind) {
+ window->drawable.height != pixmap->drawable.height) {
return FALSE;
}
More information about the xorg-commit
mailing list