xf86-video-ati: Branch 'master'

[Dave Airlie]

 src/radeon_exa_render.c |    6 ++++++
 1 file changed, 6 insertions(+)

New commits:
commit 783cdb7374941bb1d2b63eea375fbf2f1b808cc3
Author: Dave Airlie <airlied at redhat.com>
Date:   Thu Nov 27 15:29:06 2008 +1000

    r100/r200: EXA misrenders dst == a8 + dst alpha use.
    
    Fedora BZ#469556
    
    I've played with various dst and texture formats and rewritten large
    parts of this to no avail, so I'm punting for now.

diff --git a/src/radeon_exa_render.c b/src/radeon_exa_render.c
index 97199ae..e5cc196 100644
--- a/src/radeon_exa_render.c
+++ b/src/radeon_exa_render.c
@@ -533,6 +533,9 @@ static Bool FUNC_NAME(R100PrepareComposite)(int op,
     if (!RADEONGetDestFormat(pDstPicture, &dst_format))
 	return FALSE;
 
+    if (pDstPicture->format == PICT_a8 && RadeonBlendOp[op].dst_alpha)
+        RADEON_FALLBACK("Can't dst alpha blend A8\n");
+
     if (pMask)
 	info->accel_state->has_mask = TRUE;
     else
@@ -833,6 +836,9 @@ static Bool FUNC_NAME(R200PrepareComposite)(int op, PicturePtr pSrcPicture,
     if (!RADEONGetDestFormat(pDstPicture, &dst_format))
 	return FALSE;
 
+    if (pDstPicture->format == PICT_a8 && RadeonBlendOp[op].dst_alpha)
+        RADEON_FALLBACK("Can't dst alpha blend A8\n");
+
     if (pMask)
 	info->accel_state->has_mask = TRUE;
     else