Aurelien
/
xf86-video-intel
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

intel-virtual-output: Don't set the SHM active flag along !SHM composite paths 

Otherwise we may end up waiting for an event that will never be sent.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
This commit is contained in:
Chris Wilson 2013-09-02 22:55:17 +01:00
parent 13a28f607f
commit 84b66849fc
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tools/virtual.c
View File

@ -237,7 +237,9 @@ can_use_shm(Display *dpy,
*
* Remove the SendEvent bit (0x80) before doing range checks on event type.
*/
codes = XInitExtension(dpy, SHMNAME);
codes = 0;
if (has_shm)
codes = XInitExtension(dpy, SHMNAME);
if (xlib_vendor_is_xorg(dpy) &&
VendorRelease(dpy) < XORG_VERSION_ENCODE(1,11,0,1))
codes = 0;
@ -1233,7 +1235,8 @@ static void put_dst(struct clone *c, const XRectangle *clip)
0, 0,
clip->width, clip->height);
}
c->dst.serial = NextRequest(c->dst.dpy);
if (c->dst.use_shm)
c->dst.serial = NextRequest(c->dst.dpy);
XRenderComposite(c->dst.dpy, PictOpSrc,
c->dst.pix_picture, 0, c->dst.win_picture,
0, 0,