xserver: Branch 'master'

[Maarten Maathuis]

 exa/exa_render.c |    6 ++++++
 1 file changed, 6 insertions(+)

New commits:
commit 87a016ae00feac3fbaa7e7a518076a3852d49554
Author: Maarten Maathuis <madman2003 at gmail.com>
Date:   Wed Oct 15 00:02:13 2008 +0200

    exa: restore {x,y}{Src,Dst} to their original values when !done

diff --git a/exa/exa_render.c b/exa/exa_render.c
index a41b9b9..199af36 100644
--- a/exa/exa_render.c
+++ b/exa/exa_render.c
@@ -911,6 +911,12 @@ exaComposite(CARD8	op,
 
 		if (ret)
 		    goto done;
+
+		/* Let's be correct and restore the variables to their original state. */
+		xDst -= pDst->pDrawable->x;
+		yDst -= pDst->pDrawable->y;
+		xSrc -= pSrc->pDrawable->x;
+		ySrc -= pSrc->pDrawable->y;
 	    }
 	}
     }