svn merge ^/branches/released .

1 files changed, 13 insertions, 4 deletions

diff --git a/xorg-server/glx/glxdri.c b/xorg-server/glx/glxdri.c
index bd04fcd13..2119d4879 100644
--- a/xorg-server/glx/glxdri.c
+++ b/xorg-server/glx/glxdri.c
@@ -820,10 +820,19 @@ static void __glXReportDamage(__DRIdrawable *driDraw,
 

     __glXenterServer(GL_FALSE);

 

-    RegionInit(&region, (BoxPtr) rects, num_rects);

-    RegionTranslate(&region, pDraw->x, pDraw->y);

-    DamageDamageRegion(pDraw, &region);

-    RegionUninit(&region);

+    if (RegionInitBoxes(&region, (BoxPtr) rects, num_rects)) {

+	RegionTranslate(&region, pDraw->x, pDraw->y);

+	DamageDamageRegion(pDraw, &region);

+	RegionUninit(&region);

+    }

+    else {

+	while (num_rects--) {

+	    RegionInit (&region, (BoxPtr) rects++, 1);

+	    RegionTranslate(&region, pDraw->x, pDraw->y);

+	    DamageDamageRegion(pDraw, &region);

+	    RegionUninit(&region);

+	}

+    }

 

     __glXleaveServer(GL_FALSE);

 }