xserver: Branch 'master'

[Michel Daenzer]

 GL/glx/glxdri.c |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit dcc077c753137f37aa58231f1df3c4adb92b2c4b
Author: Michel Dänzer <michel at tungstengraphics.com>
Date:   Tue Feb 26 12:13:06 2008 +0100

    AIGLX: Switch to server context for calling DamageDamageRegion().
    
    Fixes https://bugs.freedesktop.org/show_bug.cgi?id=14518 .

diff --git a/GL/glx/glxdri.c b/GL/glx/glxdri.c
index 304fed2..f51a531 100644
--- a/GL/glx/glxdri.c
+++ b/GL/glx/glxdri.c
@@ -798,10 +798,14 @@ static void __glXReportDamage(__DRIdrawable *driDraw,
     DrawablePtr pDraw = drawable->base.pDraw;
     RegionRec region;
 
+    __glXenterServer(GL_FALSE);
+
     REGION_INIT(pDraw->pScreen, &region, (BoxPtr) rects, num_rects);
     REGION_TRANSLATE(pScreen, &region, pDraw->x, pDraw->y);
     DamageDamageRegion(pDraw, &region);
     REGION_UNINIT(pDraw->pScreen, &region);
+
+    __glXleaveServer(GL_FALSE);
 }
 
 /* Table of functions that we export to the driver. */