xserver: Branch 'master' - 2 commits

[Michel Daenzer]

 exa/exa_render.c    |    4 ++--
 fb/fbpict.c         |    4 ++--
 hw/xgl/xglcompose.c |    2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

New commits:
diff-tree 5e4b3232dafe3b0dec65bf639bebaba4774210b7 (from 2866e0bac9b8dd3892c5e68abcfc6c97cebaf88a)
Author: Michel Dänzer <michel at tungstengraphics.com>
Date:   Sun Apr 29 23:38:22 2007 +0200

    Fix fbCompositeTrans_0888xnx0888 build for wfb on big endian.

diff --git a/fb/fbpict.c b/fb/fbpict.c
index 2c10398..a735967 100644
--- a/fb/fbpict.c
+++ b/fb/fbpict.c
@@ -140,7 +140,7 @@ fbIn (CARD32 x, CARD8 y)
 					temp=count&3; \
 					where-=temp; \
 					workingWhere=(CARD32 *)where; \
-                                        workingVal=READ(workingWhere)++; \
+                                        workingVal=READ(workingWhere++); \
 					count=4-temp; \
 					workingVal<<=(8*temp)
         #define readPacked(where,x,y,z) {if(!(x)) { (x)=4; y = READ(z++); } where=(y)>>24; (y)<<=8; (x)--;}
diff-tree 2866e0bac9b8dd3892c5e68abcfc6c97cebaf88a (from 78a20455356ccc310f73cfc65ad65a7677eee7e5)
Author: Michel Dänzer <michel at tungstengraphics.com>
Date:   Sun Apr 29 23:38:13 2007 +0200

    Fix a couple of picture repeat fields incorrectly compared to RepeatNormal.

diff --git a/exa/exa_render.c b/exa/exa_render.c
index b78d728..d48a142 100644
--- a/exa/exa_render.c
+++ b/exa/exa_render.c
@@ -627,8 +627,8 @@ exaComposite(CARD8	op,
 	    pMask->repeat = 0;
 
     if (pExaScr->info->PrepareComposite &&
-	(!pSrc->repeat || pSrc->repeat == RepeatNormal) &&
-	(!pMask || !pMask->repeat || pMask->repeat == RepeatNormal) &&
+	(!pSrc->repeat || pSrc->repeatType == RepeatNormal) &&
+	(!pMask || !pMask->repeat || pMask->repeatType == RepeatNormal) &&
 	!pSrc->alphaMap && (!pMask || !pMask->alphaMap) && !pDst->alphaMap)
     {
 	Bool isSrcSolid;
diff --git a/fb/fbpict.c b/fb/fbpict.c
index 0a08aff..2c10398 100644
--- a/fb/fbpict.c
+++ b/fb/fbpict.c
@@ -1495,7 +1495,7 @@ fbComposite (CARD8      op,
     {
 	xMask += pMask->pDrawable->x;
 	yMask += pMask->pDrawable->y;
-	maskRepeat = pMask->repeat == RepeatNormal;
+	maskRepeat = pMask->repeatType == RepeatNormal;
 
 	if (pMask->filter == PictFilterConvolution)
 	    maskTransform = TRUE;
diff --git a/hw/xgl/xglcompose.c b/hw/xgl/xglcompose.c
index d2aead0..34f7a0c 100644
--- a/hw/xgl/xglcompose.c
+++ b/hw/xgl/xglcompose.c
@@ -177,7 +177,7 @@ xglCompositeGeneral (CARD8	     op,
     {
 	if (!pSrc->transform && pSrc->filter != PictFilterConvolution)
 	{
-	    if (pSrc->pDrawable && pSrc->repeat == RepeatNormal)
+	    if (pSrc->pDrawable && pSrc->repeatType == RepeatNormal)
 	    {
 		XGL_PIXMAP_PRIV ((PixmapPtr) pSrc->pDrawable);