xf86-video-ati: Branch 'master'

[Alex Deucher]

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

New commits:
commit a4f3d0088ba763ed8eab1d331959b5ecde8262e8
Author: Alex Deucher <alex at botch2.com>
Date:   Tue May 20 11:42:53 2008 -0400

    R3/4/5xx: fixup logic from last commit
    
    Spotted by otaylor and MrCooper

diff --git a/src/radeon_exa_render.c b/src/radeon_exa_render.c
index 04c3719..2319e3b 100644
--- a/src/radeon_exa_render.c
+++ b/src/radeon_exa_render.c
@@ -985,7 +985,7 @@ static Bool R300CheckCompositeTexture(PicturePtr pPict,
      * clipping.
      */
     if (pPict->transform != 0 && !pPict->repeat && PICT_FORMAT_A(pPict->format) == 0) {
-	if (((op != PictOpSrc) || (op != PictOpClear)) && (PICT_FORMAT_A(pDstPict->format) != 0))
+	if (!(((op == PictOpSrc) || (op == PictOpClear)) && (PICT_FORMAT_A(pDstPict->format) == 0)))
 	    RADEON_FALLBACK(("REPEAT_NONE unsupported for transformed xRGB source\n"));
     }