xserver: Branch 'master'
Michel Daenzer
daenzer at kemper.freedesktop.org
Fri Jun 13 02:23:16 PDT 2008
glx/glxdri.c | 4 ++++
1 file changed, 4 insertions(+)
New commits:
commit 23b55a61f89f69454a3b0e3413b1f07d5fdf43aa
Author: Michel Dänzer <michel at tungstengraphics.com>
Date: Fri Jun 13 11:13:56 2008 +0200
AIGLX/DRI1: Switch to server context for calling pScreen->GetImage.
Fixes http://bugs.freedesktop.org/show_bug.cgi?id=16292 .
diff --git a/glx/glxdri.c b/glx/glxdri.c
index 43b0523..a87ff13 100644
--- a/glx/glxdri.c
+++ b/glx/glxdri.c
@@ -485,9 +485,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,
@@ -529,9 +531,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,
More information about the xorg-commit
mailing list