rpms/xorg-x11-drv-ati/F-10 radeon-6.9.0-exa-dst-a8-r100-r200.patch, NONE, 1.1 xorg-x11-drv-ati.spec, 1.159, 1.160

[Dave Airlie]

Author: airlied

Update of /cvs/pkgs/rpms/xorg-x11-drv-ati/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16496

Modified Files:
	xorg-x11-drv-ati.spec 
Added Files:
	radeon-6.9.0-exa-dst-a8-r100-r200.patch 
Log Message:
- radeon-6.9.0-exa-dst-a8-r100-r200.patch - fix dst a8 with dst alpha (#469556)


radeon-6.9.0-exa-dst-a8-r100-r200.patch:

--- NEW FILE radeon-6.9.0-exa-dst-a8-r100-r200.patch ---
>From 783cdb7374941bb1d2b63eea375fbf2f1b808cc3 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied at redhat.com>
Date: Thu, 27 Nov 2008 15:29:06 +1000
Subject: [PATCH] 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.
---
 src/radeon_exa_render.c |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

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
-- 
1.6.0.3



Index: xorg-x11-drv-ati.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/F-10/xorg-x11-drv-ati.spec,v
retrieving revision 1.159
retrieving revision 1.160
diff -u -r1.159 -r1.160
--- xorg-x11-drv-ati.spec	26 Nov 2008 02:04:18 -0000	1.159
+++ xorg-x11-drv-ati.spec	27 Nov 2008 05:36:22 -0000	1.160
@@ -5,7 +5,7 @@
 Summary:   Xorg X11 ati video driver
 Name:      xorg-x11-drv-ati
 Version:   6.9.0
-Release:   58%{?dist}
+Release:   59%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -22,6 +22,7 @@
 Patch7:	    radeon-6.9.0-add-hd3300.patch
 Patch8:     radeon-6.9.0-quirk-agp.patch
 Patch9:	    radeon-6.9.0-dig1-hdmi.patch
+Patch10:    radeon-6.9.0-exa-dst-a8-r100-r200.patch
 
 ExcludeArch: s390 s390x
 
@@ -51,6 +52,7 @@
 %patch7 -p1 -b .pciid
 %patch8 -p1 -b .quirk
 %patch9 -p1 -b .hdmi
+%patch10 -p1 -b .dsta8
 
 %build
 autoreconf
@@ -82,6 +84,9 @@
 %{_mandir}/man4/radeon.4*
 
 %changelog
+* Thu Nov 27 2008 Dave Airlie <airlied at redhat.com> 6.9.0-59
+- radeon-6.9.0-exa-dst-a8-r100-r200.patch - fix dst a8 with dst alpha (#469556)
+
 * Wed Nov 26 2008 Dave Airlie <airlied at redhat.com> 6.9.0-58
 - radeon/kms: use a big hammer on rs4xx/rs6xx