From 2866e0bac9b8dd3892c5e68abcfc6c97cebaf88a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michel=20D=C3=A4nzer?= <michel@tungstengraphics.com>
Date: Sun, 29 Apr 2007 23:38:13 +0200
Subject: [PATCH] Fix a couple of picture repeat fields incorrectly compared to
 RepeatNormal.

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

diff --git a/exa/exa_render.c b/exa/exa_render.c
index b78d7282c..d48a1425f 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 0a08affd7..2c1039834 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 d2aead05b..34f7a0c43 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);