xserver: Branch 'master'

[Tilman Sauerbeck]

 exa/exa_render.c |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

New commits:
diff-tree 56ffc381d32687242dd094395fcf2216339bab2a (from aa0325db7e8ab11d9418cae14f11c488f443ccaa)
Author: Tilman Sauerbeck <tilman at code-monkey.de>
Date:   Wed Sep 26 16:47:54 2007 +0200

    EXA: Removed duplicated exaGetDrawablePixmap() calls.

diff --git a/exa/exa_render.c b/exa/exa_render.c
index 4c93128..2ad5304 100644
--- a/exa/exa_render.c
+++ b/exa/exa_render.c
@@ -384,7 +384,6 @@ exaTryDriverComposite(CARD8		op,
 				   width, height))
 	return 1;
 
-    pDstPix = exaGetDrawablePixmap (pDst->pDrawable);
     exaGetDrawableDeltas (pDst->pDrawable, pDstPix, &dst_off_x, &dst_off_y);
 
     REGION_TRANSLATE(pScreen, &region, dst_off_x, dst_off_y);
@@ -395,12 +394,12 @@ exaTryDriverComposite(CARD8		op,
     pixmaps[0].pReg = pixmaps[0].as_src ? NULL : &region;
     pixmaps[1].as_dst = FALSE;
     pixmaps[1].as_src = TRUE;
-    pixmaps[1].pPix = exaGetDrawablePixmap (pSrc->pDrawable);
+    pixmaps[1].pPix = pSrcPix;
     pixmaps[1].pReg = NULL;
     if (pMask) {
 	pixmaps[2].as_dst = FALSE;
 	pixmaps[2].as_src = TRUE;
-	pixmaps[2].pPix = exaGetDrawablePixmap (pMask->pDrawable);
+	pixmaps[2].pPix = pMaskPix;
 	pixmaps[2].pReg = NULL;
 	exaDoMigration(pixmaps, 3, TRUE);
     } else {