xf86-video-ati: Branch '6.12-branch'

[Alex Deucher]

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

New commits:
commit e1a582fd40f22d88b94a591c6886fb1b2154c3df
Author: Fredrik Höglund <fredrik at kde.org>
Date:   Mon Jun 29 22:38:26 2009 +0200

    Check if the composite op is supported in R200CheckComposite.

diff --git a/src/radeon_exa_render.c b/src/radeon_exa_render.c
index effcd89..65197c0 100644
--- a/src/radeon_exa_render.c
+++ b/src/radeon_exa_render.c
@@ -803,6 +803,10 @@ static Bool R200CheckComposite(int op, PicturePtr pSrcPicture, PicturePtr pMaskP
 
     TRACE;
 
+    /* Check for unsupported compositing operations. */
+    if (op >= sizeof(RadeonBlendOp) / sizeof(RadeonBlendOp[0]))
+	RADEON_FALLBACK(("Unsupported Composite op 0x%x\n", op));
+
     if (!pSrcPicture->pDrawable)
 	return FALSE;