diff options
| author | Alan Hourihane <[email protected]> | 2008-12-08 14:29:50 +0000 |
|---|---|---|
| committer | Alan Hourihane <[email protected]> | 2008-12-08 14:29:50 +0000 |
| commit | 33a1f495d4bb19288680b9812c6ec1235302d215 (patch) | |
| tree | d47067fe24d530c660b75ee80cdcec72f10d9ed0 /src/glx | |
| parent | bcd5dda4358a5e47551278477bd00d2c63415c44 (diff) | |
| parent | bdc8ac4426f00eaafbe8ca0d356563efe390294d (diff) | |
Merge commit 'origin/master' into gallium-0.2
Conflicts:
progs/glsl/Makefile
Diffstat (limited to 'src/glx')
| -rw-r--r-- | src/glx/x11/dri2.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/glx/x11/dri2.c b/src/glx/x11/dri2.c index 661100a218f..3b48cd9c1ca 100644 --- a/src/glx/x11/dri2.c +++ b/src/glx/x11/dri2.c @@ -293,7 +293,6 @@ void DRI2CopyRegion(Display *dpy, XID drawable, XserverRegion region, req->region = region; req->dest = dest; req->src = src; - req->bitmask = 0; _XReply(dpy, (xReply *)&rep, 0, xFalse); |