xf86-video-ati: Branch 'master'

[Fredrik Höglund]

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

New commits:
commit bb04b450ed00ca4b1aa44c33085567d47b33b547
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 4610d80..e274205 100644
--- a/src/radeon_exa_render.c
+++ b/src/radeon_exa_render.c
@@ -807,6 +807,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;