xf86-video-ati: Branch 'master'

[Alex Deucher]

 src/radeon_exa_render.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 64e6858aaf5d0e39ecc9f9804689012f3a38660a
Author: Alex Deucher <alexdeucher at gmail.com>
Date:   Mon May 17 12:50:44 2010 -0400

    r2xx exa: fix typo in 27c3326863deae36bc35e2c3b73fffd400208ff1
    
    Signed-off-by: Alex Deucher <alexdeucher at gmail.com>

diff --git a/src/radeon_exa_render.c b/src/radeon_exa_render.c
index a42588d..cf773b0 100644
--- a/src/radeon_exa_render.c
+++ b/src/radeon_exa_render.c
@@ -970,7 +970,7 @@ static Bool R200CheckComposite(int op, PicturePtr pSrcPicture, PicturePtr pMaskP
 	    return FALSE;
     }
 
-    if (!R200CheckCompositeTexture(pSrcPicture, pDstPicture, op, 1))
+    if (!R200CheckCompositeTexture(pSrcPicture, pDstPicture, op, 0))
 	return FALSE;
 
     if (!RADEONGetDestFormat(pDstPicture, &tmp1))