[xserver-commit] xserver/hw/kdrive/src kaa.c,1.17,1.18

Keith Packard xserver-commit@pdx.freedesktop.org
Sun, 09 Nov 2003 22:40:25 -0800


Committed by: keithp

Update of /cvs/xserver/xserver/hw/kdrive/src
In directory pdx:/tmp/cvs-serv6869/hw/kdrive/src

Modified Files:
	kaa.c 
Log Message:
	* hw/kdrive/src/kaa.c: (kaaComposite):
	Must offset composite parameters by drawable coordinates in
	accelerated case.


Index: kaa.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/kdrive/src/kaa.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- kaa.c	8 Nov 2003 00:28:19 -0000	1.17
+++ kaa.c	10 Nov 2003 06:40:23 -0000	1.18
@@ -967,6 +967,15 @@
 	{
 	    RegionRec	region;
 	    
+	    xDst += pDst->pDrawable->x;
+	    yDst += pDst->pDrawable->y;
+	    xSrc += pSrc->pDrawable->x;
+	    ySrc += pSrc->pDrawable->y;
+	    if (pMask)
+	    {
+		xMask += pMask->pDrawable->x;
+		yMask += pMask->pDrawable->y;
+	    }
 	    if (!miComputeCompositeRegion (&region, pSrc, pMask, pDst,
 					   xSrc, ySrc, xMask, yMask, xDst, yDst,
 					   width, height))