xserver: Branch 'master' - 3 commits

[Maarten Maathuis]

 exa/exa_migration.c |    4 ++--
 mi/miarc.c          |    2 +-
 mi/miexpose.c       |    4 ++++
 mi/miline.h         |    2 +-
 mi/miscrinit.c      |    3 ++-
 mi/mizerarc.c       |    2 +-
 6 files changed, 11 insertions(+), 6 deletions(-)

New commits:
commit d591c7d1b87c61ee8add2fce689e35cf097eed4f
Author: Maarten Maathuis <madman2003 at gmail.com>
Date:   Sat Feb 7 20:47:54 2009 +0100

    mi: kill a few warnings

diff --git a/mi/miarc.c b/mi/miarc.c
index 12c360c..a3e2580 100644
--- a/mi/miarc.c
+++ b/mi/miarc.c
@@ -1884,7 +1884,7 @@ miComputeArcs (
 	int		arcsJoin;
 	int		selfJoin;
 
-	int		iDash = 0, dashRemaining;
+	int		iDash = 0, dashRemaining = 0;
 	int		iDashStart = 0, dashRemainingStart = 0, iphaseStart;
 	int		startAngle, spanAngle, endAngle, backwards = 0;
 	int		prevDashAngle, dashAngle;
diff --git a/mi/miline.h b/mi/miline.h
index e1dd6d5..b5f706d 100644
--- a/mi/miline.h
+++ b/mi/miline.h
@@ -120,7 +120,7 @@ extern _X_EXPORT void miSetZeroLineBias(
         t = y1;  y1 = y2;  y2 = t;\
 }
 
-#define miGetZeroLineBias(_pScreen) ((unsigned long) \
+#define miGetZeroLineBias(_pScreen) ((unsigned long) (unsigned long*)\
     dixLookupPrivate(&(_pScreen)->devPrivates, miZeroLineScreenKey))
 
 #define CalcLineDeltas(_x1,_y1,_x2,_y2,_adx,_ady,_sx,_sy,_SX,_SY,_octant) \
diff --git a/mi/miscrinit.c b/mi/miscrinit.c
index 93a6c4b..fe768f4 100644
--- a/mi/miscrinit.c
+++ b/mi/miscrinit.c
@@ -308,5 +308,6 @@ DevPrivateKey miZeroLineScreenKey = &miZeroLineScreenKeyIndex;
 void
 miSetZeroLineBias(ScreenPtr pScreen, unsigned int bias)
 {
-    dixSetPrivate(&pScreen->devPrivates, miZeroLineScreenKey, (pointer)bias);
+    dixSetPrivate(&pScreen->devPrivates, miZeroLineScreenKey, 
+					(unsigned long *)(unsigned long)bias);
 }
diff --git a/mi/mizerarc.c b/mi/mizerarc.c
index 9c8df34..ad84c01 100644
--- a/mi/mizerarc.c
+++ b/mi/mizerarc.c
@@ -709,7 +709,7 @@ miZeroPolyArc(DrawablePtr pDraw, GCPtr pGC, int narcs, xArc *parcs)
     int n, maxw = 0;
     xArc *arc;
     int i;
-    DDXPointPtr points, pts, oddPts;
+    DDXPointPtr points, pts, oddPts = NULL;
     DDXPointPtr pt;
     int numPts;
     Bool dospans;
commit 00226d0b589595cdd45c75e7e28237334a8883b1
Author: Maarten Maathuis <madman2003 at gmail.com>
Date:   Fri Feb 6 20:56:49 2009 +0100

    mi: clip exposures to pGC->clientClip.

diff --git a/mi/miexpose.c b/mi/miexpose.c
index d56d187..082f906 100644
--- a/mi/miexpose.c
+++ b/mi/miexpose.c
@@ -254,6 +254,10 @@ miHandleExposures(DrawablePtr pSrcDrawable, DrawablePtr pDstDrawable,
     /* intersect with visible areas of dest */
     REGION_INTERSECT(pscr, &rgnExposed, &rgnExposed, prgnDstClip);
 
+    /* intersect with client clip region. */
+    if (pGC->clientClipType == CT_REGION)
+	REGION_INTERSECT(pscr, &rgnExposed, &rgnExposed, pGC->clientClip);
+
     /*
      * If we have LOTS of rectangles, we decide to take the extents
      * and force an exposure on that.  This should require much less
commit ffa72793e25f19a388a1369708f472921f721284
Author: Maarten Maathuis <madman2003 at gmail.com>
Date:   Fri Feb 6 20:47:01 2009 +0100

    exa: Calling exaMarkSync after UTS is the drivers responsibility.

diff --git a/exa/exa_migration.c b/exa/exa_migration.c
index 19e0f71..8fb6d2f 100644
--- a/exa/exa_migration.c
+++ b/exa/exa_migration.c
@@ -231,7 +231,7 @@ exaCopyDirty(ExaMigrationPtr migrate, RegionPtr pValidDst, RegionPtr pValidSrc,
 
     if (access_prepared)
 	exaFinishAccess(&pPixmap->drawable, fallback_index);
-    else if (need_sync)
+    else if (need_sync && sync)
 	sync (pPixmap->drawable.pScreen);
 
     pExaPixmap->offscreen = save_offscreen;
@@ -276,7 +276,7 @@ exaCopyDirtyToFb (ExaMigrationPtr migrate)
     exaCopyDirty(migrate, &pExaPixmap->validFB, &pExaPixmap->validSys,
 		 pExaScr->info->UploadToScreen, pExaPixmap->sys_ptr,
 		 pExaPixmap->fb_ptr, pExaPixmap->sys_pitch,
-		 pExaPixmap->fb_pitch, EXA_PREPARE_DEST, exaMarkSync);
+		 pExaPixmap->fb_pitch, EXA_PREPARE_DEST, NULL);
 }
 
 /**