Index: xorg/render/render.c
===================================================================
RCS file: /cvs/xorg/xserver/xorg/render/render.c,v
retrieving revision 1.13
diff -p -u -r1.13 render.c
--- xorg/render/render.c	10 Feb 2006 22:00:30 -0000	1.13
+++ xorg/render/render.c	9 May 2006 07:13:53 -0000
@@ -746,8 +746,8 @@ ProcRenderComposite (ClientPtr client)
 		    RenderErrBase + BadPicture);
     VERIFY_ALPHA (pMask, stuff->mask, client, SecurityReadAccess, 
 		  RenderErrBase + BadPicture);
-    if ((pSrc->pDrawable && pSrc->pDrawable->pScreen != pDst->pDrawable->pScreen) ||
-	(pMask && pMask->pDrawable && pSrc->pDrawable->pScreen != pMask->pDrawable->pScreen))
+    if (pSrc->pDrawable && (pSrc->pDrawable->pScreen != pDst->pDrawable->pScreen ||
+	(pMask && pMask->pDrawable && pSrc->pDrawable->pScreen != pMask->pDrawable->pScreen)))
 	return BadMatch;
     CompositePicture (stuff->op,
 		      pSrc,