xserver: Branch 'master'

[Michel Daenzer]

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

New commits:
diff-tree b9a806f0b3d495c7616b469281e5892ae7f3f6b3 (from d0f0d1092c7587a02404e1db07740e6334462ba6)
Author: Michel Dänzer <michel at tungstengraphics.com>
Date:   Fri Aug 24 19:04:55 2007 +0200

    exaPolyFillRect: pGC->alu doesn't matter with a single rectangle.

diff --git a/exa/exa_accel.c b/exa/exa_accel.c
index 692f2b8..feedd49 100644
--- a/exa/exa_accel.c
+++ b/exa/exa_accel.c
@@ -702,8 +702,9 @@ exaPolyFillRect(DrawablePtr pDrawable,
      * call exaFillRegion{Solid,Tiled}.
      */
     if ((pGC->fillStyle == FillSolid || pGC->fillStyle == FillTiled) &&
-	(pGC->alu == GXcopy || pGC->alu == GXclear || pGC->alu == GXnoop ||
-	 pGC->alu == GXcopyInverted || pGC->alu == GXset)) {
+	(nrect == 1 || pGC->alu == GXcopy || pGC->alu == GXclear ||
+	 pGC->alu == GXnoop || pGC->alu == GXcopyInverted ||
+	 pGC->alu == GXset)) {
 	if (((pGC->fillStyle == FillSolid || pGC->tileIsPixel) &&
 	     exaFillRegionSolid(pDrawable, pReg, pGC->fillStyle == FillSolid ?
 				pGC->fgPixel : pGC->tile.pixel,	pGC->planemask,