xserver: Branch 'master'

[Maarten Maathuis]

 exa/exa_unaccel.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 027b440d4f9f0cdd46addff46fd2d5c44cd5c847
Author: Maarten Maathuis <madman2003 at gmail.com>
Date:   Fri Dec 26 15:51:55 2008 +0100

    exa: preparing as source and finishing access as mask is a bad idea

diff --git a/exa/exa_unaccel.c b/exa/exa_unaccel.c
index 64c06c7..c030486 100644
--- a/exa/exa_unaccel.c
+++ b/exa/exa_unaccel.c
@@ -57,9 +57,9 @@ void
 exaFinishAccessGC(GCPtr pGC)
 {
     if (pGC->fillStyle == FillTiled)
-	exaFinishAccess(&pGC->tile.pixmap->drawable, EXA_PREPARE_MASK);
+	exaFinishAccess(&pGC->tile.pixmap->drawable, EXA_PREPARE_SRC);
     if (pGC->stipple)
-        exaFinishAccess(&pGC->stipple->drawable, EXA_PREPARE_SRC);
+        exaFinishAccess(&pGC->stipple->drawable, EXA_PREPARE_MASK);
 }
 
 #if DEBUG_TRACE_FALL