xf86-video-intel: src/i830_xaa.c

[Keith Packard]

 src/i830_xaa.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

New commits:
diff-tree 880314aabe6326ed56517034940f0e10fb16e866 (from b23eae55c8cdd73e0aba1bf7ced283d402ee6470)
Author: Keith Packard <keithp at guitar.keithp.com>
Date:   Tue Apr 24 11:37:08 2007 -0700

    CRTC Rotation under XAA wasn't hitting accelerated path.
    
    The server rotation code is now using the root window in IncludeInferiors
    mode rather than using the screen pixmap. Change the XAA Composite code
    to check for this case now.

diff --git a/src/i830_xaa.c b/src/i830_xaa.c
index 3440341..790299c 100644
--- a/src/i830_xaa.c
+++ b/src/i830_xaa.c
@@ -782,12 +782,12 @@ i830_xaa_composite(CARD8	op,
     if (pMask != NULL || op != PictOpSrc || pSrc->pDrawable == NULL)
 	goto fallback;
 
-    if (pSrc->pDrawable->type != DRAWABLE_PIXMAP ||
+    if (pSrc->pDrawable->type != DRAWABLE_WINDOW ||
 	pDst->pDrawable->type != DRAWABLE_PIXMAP)
     {
 	goto fallback;
     }
-    pSrcPixmap = (PixmapPtr)pSrc->pDrawable;
+    pSrcPixmap = (*pScreen->GetWindowPixmap) ((WindowPtr) pSrc->pDrawable);
     pDstPixmap = (PixmapPtr)pDst->pDrawable;
 
     /* Check if the dest is one of our shadow pixmaps */