diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2013-09-02 22:55:17 +0100 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2013-09-02 22:55:17 +0100 |
| commit | 84b66849fc005365e71a40517c192e0cd178a82b (patch) | |
| tree | 14451090c95123da885f835bc3055bd87f00b0a6 | |
| parent | 13a28f607f0eb4b4906e856c3f75f53446f4f999 (diff) | |
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>
| -rw-r--r-- | tools/virtual.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/tools/virtual.c b/tools/virtual.c index 7655a7b0..14386696 100644 --- a/tools/virtual.c +++ b/tools/virtual.c @@ -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, |