Revert "present/scmd: Check that the flip and screen pixmap pitches match"
This reverts commitef91da2757
. 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 commit2f0dd1816d
)
This commit is contained in:
parent
c86222d4bd
commit
26b6ba5347
@ -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;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user