xf86-video-intel: 2 commits - tools/virtual.c

[Chris Wilson]

 tools/virtual.c |   14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

New commits:
commit 0c6fa0cdf0cebcd592281e578da7a7f53cbfe186
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Fri Jun 13 19:29:41 2014 +0100

    intel-virtual-output: Initialise image after clone
    
    As the image inherits its width/height from the clone, we need to set
    those first on the clone.
    
    Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=79994
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/tools/virtual.c b/tools/virtual.c
index 0d54393..95541bd 100644
--- a/tools/virtual.c
+++ b/tools/virtual.c
@@ -1175,8 +1175,6 @@ disable_dri3:
 			return ENOMEM;
 		}
 
-		init_image(clone);
-
 		if (clone->src.use_shm) {
 			clone->src.shm = clone->shm;
 			clone->src.shm.readOnly = False;
@@ -1194,6 +1192,8 @@ disable_dri3:
 
 		clone->width = width;
 		clone->height = height;
+
+		init_image(clone);
 	}
 
 	output_init_xfer(clone, &clone->src);
commit 79b4e45ebe3a61f9b5937ad226eead9eebce87ac
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Fri Jun 13 19:15:08 2014 +0100

    intel-virtual-output: Only call XShmDetach on a valid SHM segment
    
    Saves a couple of extraneous XErrors.
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/tools/virtual.c b/tools/virtual.c
index 4b1c968..0d54393 100644
--- a/tools/virtual.c
+++ b/tools/virtual.c
@@ -1091,12 +1091,12 @@ static int clone_init_xfer(struct clone *clone)
 	     DisplayString(clone->dst.dpy), clone->dst.name,
 	     width, height));
 
-	if (clone->src.use_shm)
-		XShmDetach(clone->src.dpy, &clone->src.shm);
-	if (clone->dst.use_shm)
-		XShmDetach(clone->dst.dpy, &clone->dst.shm);
-
 	if (clone->shm.shmaddr) {
+		if (clone->src.use_shm)
+			XShmDetach(clone->src.dpy, &clone->src.shm);
+		if (clone->dst.use_shm)
+			XShmDetach(clone->dst.dpy, &clone->dst.shm);
+
 		shmdt(clone->shm.shmaddr);
 		clone->shm.shmaddr = NULL;
 	}