xserver: Branch 'server-1.5-branch'

[Adam Jackson]

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

New commits:
commit d900de5a8f61e1ee000c1a96fa6c6121ac2a92ae
Author: Michel Dänzer <michel at tungstengraphics.com>
Date:   Tue Jun 17 13:13:23 2008 -0400

    AIGLX/DRI1: Switch to server context for calling pScreen->GetImage.
    
    Fixes http://bugs.freedesktop.org/show_bug.cgi?id=16292 .
    
    (cherry picked from commit 23b55a61f89f69454a3b0e3413b1f07d5fdf43aa)

diff --git a/GL/glx/glxdri.c b/GL/glx/glxdri.c
index 9cd0738..cfa338a 100644
--- a/GL/glx/glxdri.c
+++ b/GL/glx/glxdri.c
@@ -490,9 +490,11 @@ nooverride:
 
 	    data = xalloc(pitch * pixmap->drawable.height);
 
+	    __glXenterServer(GL_FALSE);
 	    pScreen->GetImage(&pixmap->drawable, 0 /*pixmap->drawable.x*/,
 			      0 /*pixmap->drawable.y*/, pixmap->drawable.width,
 			      pixmap->drawable.height, ZPixmap, ~0, data);
+	    __glXleaveServer(GL_FALSE);
 
 	    if (pixmap->drawable.depth == 24)
 		glxFillAlphaChannel(data,
@@ -534,9 +536,11 @@ nooverride:
 					   pixmap->drawable.depth);
 	    void *data = xalloc(pitch * (p[i].y2 - p[i].y1));
 
+	    __glXenterServer(GL_FALSE);
 	    pScreen->GetImage(&pixmap->drawable, /*pixmap->drawable.x +*/ p[i].x1,
 			      /*pixmap->drawable.y*/ + p[i].y1, p[i].x2 - p[i].x1,
 			      p[i].y2 - p[i].y1, ZPixmap, ~0, data);
+	    __glXleaveServer(GL_FALSE);
 
 	    if (pixmap->drawable.depth == 24)
 		glxFillAlphaChannel(data,