xf86-video-intel: 2 commits - configure.ac tools/virtual.c
Chris Wilson
ickle at kemper.freedesktop.org
Sat Aug 31 10:52:36 PDT 2013
configure.ac | 2
tools/virtual.c | 739 ++++++++++++++++++++++++++++++++++++++++----------------
2 files changed, 540 insertions(+), 201 deletions(-)
New commits:
commit 9742ff3ae1696b7a2cc2be1849aedd8894914af4
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date: Sat Aug 31 18:22:58 2013 +0100
intel-virtual-output: use depth-16 transfers for remote hosts or low bpp targets
Avoid up-converting to a depth-24 image and wasting extra bandwidth if
either end-point is only using depth-16.
Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
diff --git a/configure.ac b/configure.ac
index 3e6b527..9afdf01 100644
--- a/configure.ac
+++ b/configure.ac
@@ -166,7 +166,7 @@ fi
PKG_CHECK_MODULES(X11, [x11 xrender xext pixman-1], [x11=yes], [x11=no])
AM_CONDITIONAL(HAVE_X11, test x$x11 = xyes)
-PKG_CHECK_MODULES(TOOL, [xrandr xdamage xfixes xcursor xtst xrender xext x11], [tools=yes], [tools=no])
+PKG_CHECK_MODULES(TOOL, [xrandr xdamage xfixes xcursor xtst xrender xext x11 pixman-1], [tools=yes], [tools=no])
AM_CONDITIONAL(BUILD_TOOLS, test x$tools = xyes)
AH_TOP([#include "xorg-server.h"])
diff --git a/tools/virtual.c b/tools/virtual.c
index c1599f2..3084467 100644
--- a/tools/virtual.c
+++ b/tools/virtual.c
@@ -32,6 +32,7 @@
#include <X11/extensions/Xrender.h>
#include <X11/extensions/record.h>
#include <X11/Xcursor/Xcursor.h>
+#include <pixman.h>
#include <sys/types.h>
#include <sys/ipc.h>
@@ -64,11 +65,20 @@ struct display {
int xfixes_event, xfixes_error;
int rr_event, rr_error;
Window root;
+ Visual *visual;
Damage damage;
+ int depth;
+
XRenderPictFormat *root_format;
+ XRenderPictFormat *rgb16_format;
XRenderPictFormat *rgb24_format;
+ int has_shm;
+ int has_shm_pixmap;
+ int shm_opcode;
+ int shm_event;
+
Cursor invisible_cursor;
Cursor visible_cursor;
@@ -93,13 +103,11 @@ struct output {
Pixmap pixmap;
GC gc;
- int depth;
int serial;
+ int use_shm;
+ int use_shm_pixmap;
- int has_shm;
- int has_shm_pixmap;
- int shm_opcode;
- int shm_event;
+ XRenderPictFormat *use_render;
int x, y;
XRRModeInfo mode;
@@ -112,7 +120,7 @@ struct clone {
XShmSegmentInfo shm;
XImage image;
- int width, height;
+ int width, height, depth;
struct { int x1, x2, y1, y2; } damaged;
int rr_update;
};
@@ -478,48 +486,60 @@ static void init_image(struct clone *clone)
image->width = clone->width;
image->height = clone->height;
image->format = ZPixmap;
+ image->xoffset = 0;
image->byte_order = LSBFirst;
image->bitmap_unit = 32;
image->bitmap_bit_order = LSBFirst;
- image->red_mask = 0xff << 16;
- image->green_mask = 0xff << 8;
- image->blue_mask = 0xff << 0;;
- image->xoffset = 0;
image->bitmap_pad = 32;
- image->depth = 24;
image->data = clone->shm.shmaddr;
- image->bytes_per_line = 4*clone->width;
- image->bits_per_pixel = 32;
+ switch (clone->depth) {
+ case 24:
+ image->red_mask = 0xff << 16;
+ image->green_mask = 0xff << 8;
+ image->blue_mask = 0xff << 0;;
+ image->depth = 24;
+ image->bytes_per_line = 4*clone->width;
+ image->bits_per_pixel = 32;
+ break;
+ case 16:
+ image->red_mask = 0x1f << 11;
+ image->green_mask = 0x3f << 5;
+ image->blue_mask = 0x1f << 0;;
+ image->depth = 16;
+ image->bytes_per_line = 2*clone->width;
+ image->bits_per_pixel = 16;
+ break;
+ }
ret = XInitImage(image);
assert(ret);
}
-static void output_create_xfer(struct clone *clone, struct output *output)
+static void output_init_xfer(struct clone *clone, struct output *output)
{
- if (output->has_shm_pixmap) {
+ if (output->use_shm_pixmap) {
DBG(("%s-%s: creating shm pixmap\n", DisplayString(output->dpy), output->name));
if (output->pixmap)
XFreePixmap(output->dpy, output->pixmap);
output->pixmap = XShmCreatePixmap(output->dpy, output->window,
clone->shm.shmaddr, &clone->shm,
- clone->width, clone->height, 24);
+ clone->width, clone->height, clone->depth);
if (output->pix_picture) {
XRenderFreePicture(output->dpy, output->pix_picture);
output->pix_picture = None;
}
}
- if (output->display->rgb24_format != output->display->root_format) {
+ if (output->use_render) {
DBG(("%s-%s: creating picture\n", DisplayString(output->dpy), output->name));
if (output->win_picture == None)
output->win_picture = XRenderCreatePicture(output->dpy, output->window,
output->display->root_format, 0, NULL);
if (output->pixmap == None)
output->pixmap = XCreatePixmap(output->dpy, output->window,
- clone->width, clone->height, 24);
+ clone->width, clone->height, clone->depth);
if (output->pix_picture == None)
output->pix_picture = XRenderCreatePicture(output->dpy, output->pixmap,
- output->display->rgb24_format, 0, NULL);
+ output->use_render, 0, NULL);
}
if (output->gc == None) {
@@ -532,7 +552,7 @@ static void output_create_xfer(struct clone *clone, struct output *output)
}
}
-static int clone_create_xfer(struct clone *clone)
+static int clone_init_xfer(struct clone *clone)
{
DBG(("%s-%s create xfer\n",
DisplayString(clone->dst.dpy), clone->dst.name));
@@ -543,7 +563,9 @@ static int clone_create_xfer(struct clone *clone)
if (clone->shm.shmaddr)
shmdt(clone->shm.shmaddr);
- clone->shm.shmid = shmget(IPC_PRIVATE, clone->height * clone->width * 4, IPC_CREAT | 0666);
+ clone->shm.shmid = shmget(IPC_PRIVATE,
+ clone->height * clone->width * clone->depth / 8,
+ IPC_CREAT | 0666);
if (clone->shm.shmid == -1)
return errno;
@@ -557,19 +579,19 @@ static int clone_create_xfer(struct clone *clone)
init_image(clone);
- if (clone->src.has_shm) {
+ if (clone->src.use_shm) {
XShmAttach(clone->src.dpy, &clone->shm);
XSync(clone->src.dpy, False);
}
- if (clone->dst.has_shm) {
+ if (clone->dst.use_shm) {
XShmAttach(clone->dst.dpy, &clone->shm);
XSync(clone->dst.dpy, False);
}
shmctl(clone->shm.shmid, IPC_RMID, NULL);
- output_create_xfer(clone, &clone->src);
- output_create_xfer(clone, &clone->dst);
+ output_init_xfer(clone, &clone->src);
+ output_init_xfer(clone, &clone->dst);
clone->damaged.x1 = clone->src.x;
clone->damaged.x2 = clone->src.x + clone->width;
@@ -595,7 +617,7 @@ static int clone_update_src(struct clone *clone)
if (clone->src.mode.width != clone->width ||
clone->src.mode.height != clone->height)
- clone_create_xfer(clone);
+ clone_init_xfer(clone);
clone->damaged.x1 = clone->src.x;
clone->damaged.x2 = clone->src.x + clone->width;
@@ -721,6 +743,7 @@ static int clone_output_init(struct clone *clone, struct output *output,
struct display *display, const char *name)
{
Display *dpy = display->dpy;
+ int depth;
DBG(("%s(%s, %s)\n", __func__, DisplayString(dpy), name));
@@ -735,12 +758,13 @@ static int clone_output_init(struct clone *clone, struct output *output,
if (output->name == NULL)
return ENOMEM;
- output->depth = DefaultDepth(dpy, DefaultScreen(dpy));
output->window = display->root;
- output->has_shm = can_use_shm(dpy, output->window,
- &output->shm_event,
- &output->shm_opcode,
- &output->has_shm_pixmap);
+ output->use_shm = display->has_shm;
+ output->use_shm_pixmap = display->has_shm_pixmap;
+
+ depth = output->use_shm ? display->depth : 16;
+ if (depth < clone->depth)
+ clone->depth = depth;
return 0;
}
@@ -749,16 +773,16 @@ static void send_shm(struct output *o, int serial)
{
XShmCompletionEvent e;
- if (o->shm_event == 0) {
+ if (o->display->shm_event == 0) {
XSync(o->dpy, False);
return;
}
- e.type = o->shm_event;
+ e.type = o->display->shm_event;
e.send_event = 1;
e.serial = serial;
e.drawable = o->pixmap;
- e.major_code = o->shm_opcode;
+ e.major_code = o->display->shm_opcode;
e.minor_code = X_ShmPutImage;
e.shmseg = 0;
e.offset = 0;
@@ -771,16 +795,16 @@ static void get_src(struct clone *c, const XRectangle *clip)
{
DBG(("%s-%s get_src(%d,%d)x(%d,%d)\n", DisplayString(c->dst.dpy), c->dst.name,
clip->x, clip->y, clip->width, clip->height));
- if (c->src.win_picture) {
+ if (c->src.use_render) {
XRenderComposite(c->src.dpy, PictOpSrc,
c->src.win_picture, 0, c->src.pix_picture,
clip->x, clip->y,
0, 0,
0, 0,
clip->width, clip->height);
- if (c->src.has_shm_pixmap) {
+ if (c->src.use_shm_pixmap) {
XSync(c->src.dpy, False);
- } else if (c->src.has_shm) {
+ } else if (c->src.use_shm) {
c->image.width = clip->width;
c->image.height = clip->height;
c->image.obdata = (char *)&c->shm;
@@ -801,7 +825,7 @@ static void get_src(struct clone *c, const XRectangle *clip)
clip->width, clip->height,
0, 0);
XSync(c->src.dpy, False);
- } else if (c->src.has_shm) {
+ } else if (c->src.use_shm) {
c->image.width = clip->width;
c->image.height = clip->height;
c->image.obdata = (char *)&c->shm;
@@ -822,10 +846,10 @@ static void put_dst(struct clone *c, const XRectangle *clip)
{
DBG(("%s-%s put_dst(%d,%d)x(%d,%d)\n", DisplayString(c->dst.dpy), c->dst.name,
clip->x, clip->y, clip->width, clip->height));
- if (c->dst.win_picture) {
+ if (c->dst.use_render) {
int serial;
- if (c->dst.has_shm_pixmap) {
- } else if (c->dst.has_shm) {
+ if (c->dst.use_shm_pixmap) {
+ } else if (c->dst.use_shm) {
c->image.width = clip->width;
c->image.height = clip->height;
c->image.obdata = (char *)&c->shm;
@@ -850,7 +874,7 @@ static void put_dst(struct clone *c, const XRectangle *clip)
0, 0,
clip->x, clip->y,
clip->width, clip->height);
- if (c->dst.has_shm)
+ if (c->dst.use_shm)
send_shm(&c->dst, serial);
} else if (c->dst.pixmap) {
int serial = NextRequest(c->dst.dpy);
@@ -859,7 +883,7 @@ static void put_dst(struct clone *c, const XRectangle *clip)
clip->width, clip->height,
clip->x, clip->y);
send_shm(&c->dst, serial);
- } else if (c->dst.has_shm) {
+ } else if (c->dst.use_shm) {
c->image.width = clip->width;
c->image.height = clip->height;
c->image.obdata = (char *)&c->shm;
@@ -1012,43 +1036,222 @@ static int timer(int hz)
return fd;
}
-static int display_init_core(struct display *display)
+static int bad_visual(Visual *visual, int depth)
+{
+ switch (depth) {
+ case 16: return (visual->bits_per_rgb != 6 ||
+ visual->red_mask != 0x1f << 11 ||
+ visual->green_mask != 0x3f << 5 ||
+ visual->blue_mask != 0x1f << 0);
+ case 24: return (visual->bits_per_rgb != 8 ||
+ visual->red_mask != 0xff << 16 ||
+ visual->green_mask != 0xff << 8 ||
+ visual->blue_mask != 0xff << 0);
+ default: return 0;
+ }
+}
+
+static XRenderPictFormat *
+find_xrender_format(Display *dpy, pixman_format_code_t format)
+{
+ XRenderPictFormat tmpl;
+ int mask;
+
+#define MASK(x) ((1<<(x))-1)
+
+ memset(&tmpl, 0, sizeof(tmpl));
+
+ tmpl.depth = PIXMAN_FORMAT_DEPTH(format);
+ mask = PictFormatType | PictFormatDepth;
+
+ DBG(("%s(0x%08lx)\n", __func__, (long)format));
+
+ switch (PIXMAN_FORMAT_TYPE(format)) {
+ case PIXMAN_TYPE_ARGB:
+ tmpl.type = PictTypeDirect;
+
+ if (PIXMAN_FORMAT_A(format)) {
+ tmpl.direct.alphaMask = MASK(PIXMAN_FORMAT_A(format));
+ tmpl.direct.alpha = (PIXMAN_FORMAT_R(format) +
+ PIXMAN_FORMAT_G(format) +
+ PIXMAN_FORMAT_B(format));
+ }
+
+ tmpl.direct.redMask = MASK(PIXMAN_FORMAT_R(format));
+ tmpl.direct.red = (PIXMAN_FORMAT_G(format) +
+ PIXMAN_FORMAT_B(format));
+
+ tmpl.direct.greenMask = MASK(PIXMAN_FORMAT_G(format));
+ tmpl.direct.green = PIXMAN_FORMAT_B(format);
+
+ tmpl.direct.blueMask = MASK(PIXMAN_FORMAT_B(format));
+ tmpl.direct.blue = 0;
+
+ mask |= PictFormatRed | PictFormatRedMask;
+ mask |= PictFormatGreen | PictFormatGreenMask;
+ mask |= PictFormatBlue | PictFormatBlueMask;
+ mask |= PictFormatAlpha | PictFormatAlphaMask;
+ break;
+
+ case PIXMAN_TYPE_ABGR:
+ tmpl.type = PictTypeDirect;
+
+ if (tmpl.direct.alphaMask) {
+ tmpl.direct.alphaMask = MASK(PIXMAN_FORMAT_A(format));
+ tmpl.direct.alpha = (PIXMAN_FORMAT_B(format) +
+ PIXMAN_FORMAT_G(format) +
+ PIXMAN_FORMAT_R(format));
+ }
+
+ tmpl.direct.blueMask = MASK(PIXMAN_FORMAT_B(format));
+ tmpl.direct.blue = (PIXMAN_FORMAT_G(format) +
+ PIXMAN_FORMAT_R(format));
+
+ tmpl.direct.greenMask = MASK(PIXMAN_FORMAT_G(format));
+ tmpl.direct.green = PIXMAN_FORMAT_R(format);
+
+ tmpl.direct.redMask = MASK(PIXMAN_FORMAT_R(format));
+ tmpl.direct.red = 0;
+
+ mask |= PictFormatRed | PictFormatRedMask;
+ mask |= PictFormatGreen | PictFormatGreenMask;
+ mask |= PictFormatBlue | PictFormatBlueMask;
+ mask |= PictFormatAlpha | PictFormatAlphaMask;
+ break;
+
+ case PIXMAN_TYPE_BGRA:
+ tmpl.type = PictTypeDirect;
+
+ tmpl.direct.blueMask = MASK(PIXMAN_FORMAT_B(format));
+ tmpl.direct.blue = (PIXMAN_FORMAT_BPP(format) - PIXMAN_FORMAT_B(format));
+
+ tmpl.direct.greenMask = MASK(PIXMAN_FORMAT_G(format));
+ tmpl.direct.green = (PIXMAN_FORMAT_BPP(format) - PIXMAN_FORMAT_B(format) -
+ PIXMAN_FORMAT_G(format));
+
+ tmpl.direct.redMask = MASK(PIXMAN_FORMAT_R(format));
+ tmpl.direct.red = (PIXMAN_FORMAT_BPP(format) - PIXMAN_FORMAT_B(format) -
+ PIXMAN_FORMAT_G(format) - PIXMAN_FORMAT_R(format));
+
+ if (tmpl.direct.alphaMask) {
+ tmpl.direct.alphaMask = MASK(PIXMAN_FORMAT_A(format));
+ tmpl.direct.alpha = 0;
+ }
+
+ mask |= PictFormatRed | PictFormatRedMask;
+ mask |= PictFormatGreen | PictFormatGreenMask;
+ mask |= PictFormatBlue | PictFormatBlueMask;
+ mask |= PictFormatAlpha | PictFormatAlphaMask;
+ break;
+
+ case PIXMAN_TYPE_A:
+ tmpl.type = PictTypeDirect;
+
+ tmpl.direct.alpha = 0;
+ tmpl.direct.alphaMask = MASK(PIXMAN_FORMAT_A(format));
+
+ mask |= PictFormatAlpha | PictFormatAlphaMask;
+ break;
+
+ case PIXMAN_TYPE_COLOR:
+ case PIXMAN_TYPE_GRAY:
+ /* XXX Find matching visual/colormap */
+ tmpl.type = PictTypeIndexed;
+ //tmpl.colormap = screen->visuals[PIXMAN_FORMAT_VIS(format)].vid;
+ //mask |= PictFormatColormap;
+ return NULL;
+ }
+#undef MASK
+
+ return XRenderFindFormat(dpy, mask, &tmpl, 0);
+}
+
+static int display_init_render(struct display *display, int depth, XRenderPictFormat **use_render)
{
Display *dpy = display->dpy;
- Visual *visual;
int major, minor;
- display->root = DefaultRootWindow(dpy);
+ DBG(("%s is depth %d, want %d\n", DisplayString(dpy), display->depth, depth));
- visual = DefaultVisual(dpy, DefaultScreen(dpy));
- if (visual->bits_per_rgb != 8 ||
- visual->red_mask != 0xff << 16 ||
- visual->green_mask != 0xff << 8 ||
- visual->blue_mask != 0xff << 0) {
- DBG(("%s: has non-RGB24 visual, forcing render (bpp=%d, red=%lx, green=%lx, blue=%lx)\n",
- DisplayString(dpy), visual->bits_per_rgb,
- (long)visual->red_mask,
- (long)visual->green_mask,
- (long)visual->blue_mask));
+ *use_render = 0;
+ if (depth == display->depth && !bad_visual(display->visual, depth))
+ return 0;
+ if (display->root_format == 0) {
if (!XRenderQueryVersion(dpy, &major, &minor)) {
fprintf(stderr, "Render extension not supported by %s\n", DisplayString(dpy));
- return -EINVAL;
+ return EINVAL;
}
- display->root_format = XRenderFindVisualFormat(dpy, visual);
+ display->root_format = XRenderFindVisualFormat(dpy, display->visual);
+ display->rgb16_format = find_xrender_format(dpy, PIXMAN_r5g6b5);
display->rgb24_format = XRenderFindStandardFormat(dpy, PictStandardRGB24);
- DBG(("%s: root=%x, rgb24=%x\n", DisplayString(dpy),
- (int)display->root_format->id, (int)display->rgb24_format->id));
+ DBG(("%s: root format=%lx, rgb16 format=%lx, rgb24 format=%lx\n",
+ DisplayString(dpy),
+ (long)display->root_format,
+ (long)display->rgb16_format,
+ (long)display->rgb24_format));
+ }
+
+ switch (depth) {
+ case 16: *use_render = display->rgb16_format; break;
+ case 24: *use_render = display->rgb24_format; break;
}
+ if (*use_render == 0)
+ return ENOENT;
+
+ return 0;
+}
+
+static int clone_init_depth(struct clone *clone)
+{
+ int ret, depth;
+
+ DBG(("%s-%s wants depth %d\n",
+ DisplayString(clone->dst.dpy), clone->dst.name, clone->depth));
+
+ for (depth = clone->depth; depth <= 24; depth += 8) {
+ ret = display_init_render(clone->src.display, depth, &clone->src.use_render);
+ if (ret)
+ continue;
+
+ ret = display_init_render(clone->dst.display, depth, &clone->dst.use_render);
+ if (ret)
+ continue;
+
+ break;
+ }
+ if (ret)
+ return ret;
+
+ DBG(("%s-%s using depth %d, requires xrender for src? %d, for dst? %d\n",
+ DisplayString(clone->dst.dpy), clone->dst.name,
+ clone->depth,
+ clone->src.use_render != NULL,
+ clone->dst.use_render != NULL));
+
+ return 0;
+}
+
+static int display_init_core(struct display *display)
+{
+ Display *dpy = display->dpy;
+
+ display->root = DefaultRootWindow(dpy);
+ display->depth = DefaultDepth(dpy, DefaultScreen(dpy));
+ display->visual = DefaultVisual(dpy, DefaultScreen(dpy));
+
+ display->has_shm = can_use_shm(dpy, display->root,
+ &display->shm_event,
+ &display->shm_opcode,
+ &display->has_shm_pixmap);
if (!XRRQueryExtension(dpy, &display->rr_event, &display->rr_error)) {
fprintf(stderr, "RandR extension not supported by %s\n", DisplayString(dpy));
return -EINVAL;
}
-
display->invisible_cursor = display_load_invisible_cursor(display);
display->cursor = None;
@@ -1258,6 +1461,8 @@ int main(int argc, char **argv)
display_init_randr_hpd(&ctx.display[ctx.num_display-1]);
}
+ ctx.clones[ctx.num_clones].depth = 24;
+
sprintf(buf, "VIRTUAL%d", ctx.num_clones+1);
ret = clone_output_init(&ctx.clones[ctx.num_clones], &ctx.clones[ctx.num_clones].src, &ctx.display[0], buf);
if (ret) {
@@ -1282,6 +1487,13 @@ int main(int argc, char **argv)
return ret;
}
+ ret = clone_init_depth(&ctx.clones[ctx.num_clones]);
+ if (ret) {
+ fprintf(stderr, "Failed to negotiate image format for display \"%s\"\n",
+ DisplayString(ctx.display[nfd-1].dpy));
+ return ret;
+ }
+
ret = clone_update_dst(&ctx.clones[ctx.num_clones].dst, &ctx.clones[ctx.num_clones].src);
if (ret) {
fprintf(stderr, "Failed to clone output \"%s\" from display \"%s\"\n",
commit 6509e46ecac968d177789cd4731e7721bb62f35a
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date: Sat Aug 31 17:08:11 2013 +0100
intel-virtual-output: use XRender for format conversion if required
Support rendering between mixed depths by using Render to stage the
transfer into our x8r8g8b8 image. An improvement would be to use the gcd
intermediate depth so we don't waste bw unecessarily.
Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
diff --git a/configure.ac b/configure.ac
index d005052..3e6b527 100644
--- a/configure.ac
+++ b/configure.ac
@@ -166,7 +166,7 @@ fi
PKG_CHECK_MODULES(X11, [x11 xrender xext pixman-1], [x11=yes], [x11=no])
AM_CONDITIONAL(HAVE_X11, test x$x11 = xyes)
-PKG_CHECK_MODULES(TOOL, [xrandr xdamage xfixes xcursor xtst xext x11], [tools=yes], [tools=no])
+PKG_CHECK_MODULES(TOOL, [xrandr xdamage xfixes xcursor xtst xrender xext x11], [tools=yes], [tools=no])
AM_CONDITIONAL(BUILD_TOOLS, test x$tools = xyes)
AH_TOP([#include "xorg-server.h"])
diff --git a/tools/virtual.c b/tools/virtual.c
index e9f5e64..c1599f2 100644
--- a/tools/virtual.c
+++ b/tools/virtual.c
@@ -29,6 +29,7 @@
#include <X11/extensions/shmproto.h>
#include <X11/extensions/Xdamage.h>
#include <X11/extensions/Xrandr.h>
+#include <X11/extensions/Xrender.h>
#include <X11/extensions/record.h>
#include <X11/Xcursor/Xcursor.h>
@@ -65,6 +66,9 @@ struct display {
Window root;
Damage damage;
+ XRenderPictFormat *root_format;
+ XRenderPictFormat *rgb24_format;
+
Cursor invisible_cursor;
Cursor visible_cursor;
@@ -84,7 +88,8 @@ struct output {
RROutput rr_output;
XShmSegmentInfo shm;
Window window;
- Picture picture;
+ Picture win_picture;
+ Picture pix_picture;
Pixmap pixmap;
GC gc;
@@ -282,7 +287,7 @@ static XRRModeInfo *lookup_mode(XRRScreenResources *res, int id)
return NULL;
}
-static int clone_update_modes(struct output *src, struct output *dst)
+static int clone_update_dst(struct output *src, struct output *dst)
{
XRRScreenResources *src_res, *dst_res;
XRROutputInfo *src_info, *dst_info;
@@ -465,15 +470,153 @@ err:
return ret;
}
-static void clone_update(struct clone *clone)
+static void init_image(struct clone *clone)
+{
+ XImage *image = &clone->image;
+ int ret;
+
+ image->width = clone->width;
+ image->height = clone->height;
+ image->format = ZPixmap;
+ image->byte_order = LSBFirst;
+ image->bitmap_unit = 32;
+ image->bitmap_bit_order = LSBFirst;
+ image->red_mask = 0xff << 16;
+ image->green_mask = 0xff << 8;
+ image->blue_mask = 0xff << 0;;
+ image->xoffset = 0;
+ image->bitmap_pad = 32;
+ image->depth = 24;
+ image->data = clone->shm.shmaddr;
+ image->bytes_per_line = 4*clone->width;
+ image->bits_per_pixel = 32;
+
+ ret = XInitImage(image);
+ assert(ret);
+}
+
+static void output_create_xfer(struct clone *clone, struct output *output)
+{
+ if (output->has_shm_pixmap) {
+ DBG(("%s-%s: creating shm pixmap\n", DisplayString(output->dpy), output->name));
+ if (output->pixmap)
+ XFreePixmap(output->dpy, output->pixmap);
+ output->pixmap = XShmCreatePixmap(output->dpy, output->window,
+ clone->shm.shmaddr, &clone->shm,
+ clone->width, clone->height, 24);
+ if (output->pix_picture) {
+ XRenderFreePicture(output->dpy, output->pix_picture);
+ output->pix_picture = None;
+ }
+ }
+ if (output->display->rgb24_format != output->display->root_format) {
+ DBG(("%s-%s: creating picture\n", DisplayString(output->dpy), output->name));
+ if (output->win_picture == None)
+ output->win_picture = XRenderCreatePicture(output->dpy, output->window,
+ output->display->root_format, 0, NULL);
+ if (output->pixmap == None)
+ output->pixmap = XCreatePixmap(output->dpy, output->window,
+ clone->width, clone->height, 24);
+ if (output->pix_picture == None)
+ output->pix_picture = XRenderCreatePicture(output->dpy, output->pixmap,
+ output->display->rgb24_format, 0, NULL);
+ }
+
+ if (output->gc == None) {
+ XGCValues gcv;
+
+ gcv.graphics_exposures = False;
+ gcv.subwindow_mode = IncludeInferiors;
+
+ output->gc = XCreateGC(output->dpy, output->pixmap ?: output->window, GCGraphicsExposures | GCSubwindowMode, &gcv);
+ }
+}
+
+static int clone_create_xfer(struct clone *clone)
+{
+ DBG(("%s-%s create xfer\n",
+ DisplayString(clone->dst.dpy), clone->dst.name));
+
+ clone->width = clone->src.mode.width;
+ clone->height = clone->src.mode.height;
+
+ if (clone->shm.shmaddr)
+ shmdt(clone->shm.shmaddr);
+
+ clone->shm.shmid = shmget(IPC_PRIVATE, clone->height * clone->width * 4, IPC_CREAT | 0666);
+ if (clone->shm.shmid == -1)
+ return errno;
+
+ clone->shm.shmaddr = shmat(clone->shm.shmid, 0, 0);
+ if (clone->shm.shmaddr == (char *) -1) {
+ shmctl(clone->shm.shmid, IPC_RMID, NULL);
+ return ENOMEM;
+ }
+
+ clone->shm.readOnly = 0;
+
+ init_image(clone);
+
+ if (clone->src.has_shm) {
+ XShmAttach(clone->src.dpy, &clone->shm);
+ XSync(clone->src.dpy, False);
+ }
+ if (clone->dst.has_shm) {
+ XShmAttach(clone->dst.dpy, &clone->shm);
+ XSync(clone->dst.dpy, False);
+ }
+
+ shmctl(clone->shm.shmid, IPC_RMID, NULL);
+
+ output_create_xfer(clone, &clone->src);
+ output_create_xfer(clone, &clone->dst);
+
+ clone->damaged.x1 = clone->src.x;
+ clone->damaged.x2 = clone->src.x + clone->width;
+ clone->damaged.y1 = clone->src.y;
+ clone->damaged.y2 = clone->src.y + clone->height;
+
+ clone->dst.display->flush = 1;
+ return 0;
+}
+
+static int clone_update_src(struct clone *clone)
+{
+ int ret;
+
+ DBG(("%s-%s clone %s\n",
+ DisplayString(clone->dst.dpy), clone->dst.name, clone->src.name));
+
+ ret = get_current_config(&clone->src);
+ if (ret)
+ return ret;
+
+ set_config(&clone->dst, &clone->src);
+
+ if (clone->src.mode.width != clone->width ||
+ clone->src.mode.height != clone->height)
+ clone_create_xfer(clone);
+
+ clone->damaged.x1 = clone->src.x;
+ clone->damaged.x2 = clone->src.x + clone->width;
+ clone->damaged.y1 = clone->src.y;
+ clone->damaged.y2 = clone->src.y + clone->height;
+
+ return 0;
+}
+
+static void clone_update(struct clone *clone, int reconfigure)
{
+ if (reconfigure)
+ clone_update_src(clone);
+
if (!clone->rr_update)
return;
DBG(("%s-%s cloning modes\n",
DisplayString(clone->dst.dpy), clone->dst.name));
- clone_update_modes(&clone->dst, &clone->src);
+ clone_update_dst(&clone->dst, &clone->src);
clone->rr_update = 0;
}
@@ -574,118 +717,10 @@ static void clone_move_cursor(struct clone *c, int x, int y)
display_cursor_move(c->dst.display, x, y, visible);
}
-static void init_image(struct clone *clone)
-{
- XImage *image = &clone->image;
- int ret;
-
- image->width = clone->width;
- image->height = clone->height;
- image->format = ZPixmap;
- image->byte_order = LSBFirst;
- image->bitmap_unit = 32;
- image->bitmap_bit_order = LSBFirst;
- image->red_mask = 0xff << 16;
- image->green_mask = 0xff << 8;
- image->blue_mask = 0xff << 0;;
- image->xoffset = 0;
- image->bitmap_pad = 32;
- image->depth = 24;
- image->data = clone->shm.shmaddr;
- image->bytes_per_line = 4*clone->width;
- image->bits_per_pixel = 32;
-
- ret = XInitImage(image);
- assert(ret);
-}
-
-static int clone_create_xfer(struct clone *clone)
-{
- DBG(("%s-%s create xfer\n",
- DisplayString(clone->dst.dpy), clone->dst.name));
-
- clone->width = clone->src.mode.width;
- clone->height = clone->src.mode.height;
-
- if (clone->shm.shmaddr)
- shmdt(clone->shm.shmaddr);
-
- clone->shm.shmid = shmget(IPC_PRIVATE, clone->height * clone->width * 4, IPC_CREAT | 0666);
- if (clone->shm.shmid == -1)
- return errno;
-
- clone->shm.shmaddr = shmat(clone->shm.shmid, 0, 0);
- if (clone->shm.shmaddr == (char *) -1) {
- shmctl(clone->shm.shmid, IPC_RMID, NULL);
- return ENOMEM;
- }
-
- clone->shm.readOnly = 0;
-
- init_image(clone);
-
- if (clone->src.has_shm) {
- XShmAttach(clone->src.dpy, &clone->shm);
- XSync(clone->src.dpy, False);
- }
- if (clone->dst.has_shm) {
- XShmAttach(clone->dst.dpy, &clone->shm);
- XSync(clone->dst.dpy, False);
- }
-
- shmctl(clone->shm.shmid, IPC_RMID, NULL);
-
- if (clone->src.has_shm_pixmap) {
- clone->src.pixmap = XShmCreatePixmap(clone->src.dpy, clone->src.window,
- clone->shm.shmaddr, &clone->shm,
- clone->width, clone->height, clone->src.depth);
- }
-
- if (clone->dst.has_shm_pixmap) {
- clone->dst.pixmap = XShmCreatePixmap(clone->dst.dpy, clone->dst.window,
- clone->shm.shmaddr, &clone->shm,
- clone->width, clone->height, clone->dst.depth);
- }
-
- clone->damaged.x1 = clone->src.x;
- clone->damaged.x2 = clone->src.x + clone->width;
- clone->damaged.y1 = clone->src.y;
- clone->damaged.y2 = clone->src.y + clone->height;
-
- clone->dst.display->flush = 1;
- return 0;
-}
-
-static int clone_output(struct clone *clone)
-{
- int ret;
-
- DBG(("%s-%s clone %s\n",
- DisplayString(clone->dst.dpy), clone->dst.name, clone->src.name));
-
- ret = get_current_config(&clone->src);
- if (ret)
- return ret;
-
- set_config(&clone->dst, &clone->src);
-
- if (clone->src.mode.width != clone->width ||
- clone->src.mode.height != clone->height)
- clone_create_xfer(clone);
-
- clone->damaged.x1 = clone->src.x;
- clone->damaged.x2 = clone->src.x + clone->width;
- clone->damaged.y1 = clone->src.y;
- clone->damaged.y2 = clone->src.y + clone->height;
-
- return 0;
-}
-
static int clone_output_init(struct clone *clone, struct output *output,
struct display *display, const char *name)
{
Display *dpy = display->dpy;
- XGCValues gcv;
DBG(("%s(%s, %s)\n", __func__, DisplayString(dpy), name));
@@ -707,11 +742,6 @@ static int clone_output_init(struct clone *clone, struct output *output,
&output->shm_opcode,
&output->has_shm_pixmap);
- gcv.graphics_exposures = False;
- gcv.subwindow_mode = IncludeInferiors;
-
- output->gc = XCreateGC(dpy, output->window, GCGraphicsExposures | GCSubwindowMode, &gcv);
-
return 0;
}
@@ -719,6 +749,11 @@ static void send_shm(struct output *o, int serial)
{
XShmCompletionEvent e;
+ if (o->shm_event == 0) {
+ XSync(o->dpy, False);
+ return;
+ }
+
e.type = o->shm_event;
e.send_event = 1;
e.serial = serial;
@@ -736,7 +771,30 @@ static void get_src(struct clone *c, const XRectangle *clip)
{
DBG(("%s-%s get_src(%d,%d)x(%d,%d)\n", DisplayString(c->dst.dpy), c->dst.name,
clip->x, clip->y, clip->width, clip->height));
- if (c->src.picture) {
+ if (c->src.win_picture) {
+ XRenderComposite(c->src.dpy, PictOpSrc,
+ c->src.win_picture, 0, c->src.pix_picture,
+ clip->x, clip->y,
+ 0, 0,
+ 0, 0,
+ clip->width, clip->height);
+ if (c->src.has_shm_pixmap) {
+ XSync(c->src.dpy, False);
+ } else if (c->src.has_shm) {
+ c->image.width = clip->width;
+ c->image.height = clip->height;
+ c->image.obdata = (char *)&c->shm;
+ XShmGetImage(c->src.dpy, c->src.pixmap, &c->image,
+ clip->x, clip->y, AllPlanes);
+ } else {
+ c->image.width = c->width;
+ c->image.height = c->height;
+ c->image.obdata = 0;
+ XGetSubImage(c->src.dpy, c->src.pixmap,
+ clip->x, clip->y, clip->width, clip->height,
+ AllPlanes, ZPixmap,
+ &c->image, 0, 0);
+ }
} else if (c->src.pixmap) {
XCopyArea(c->src.dpy, c->src.window, c->src.pixmap, c->src.gc,
clip->x, clip->y,
@@ -764,7 +822,36 @@ static void put_dst(struct clone *c, const XRectangle *clip)
{
DBG(("%s-%s put_dst(%d,%d)x(%d,%d)\n", DisplayString(c->dst.dpy), c->dst.name,
clip->x, clip->y, clip->width, clip->height));
- if (c->dst.picture) {
+ if (c->dst.win_picture) {
+ int serial;
+ if (c->dst.has_shm_pixmap) {
+ } else if (c->dst.has_shm) {
+ c->image.width = clip->width;
+ c->image.height = clip->height;
+ c->image.obdata = (char *)&c->shm;
+ XShmPutImage(c->dst.dpy, c->dst.pixmap, c->dst.gc, &c->image,
+ 0, 0,
+ 0, 0,
+ clip->width, clip->height,
+ False);
+ } else {
+ c->image.width = c->width;
+ c->image.height = c->height;
+ c->image.obdata = 0;
+ XPutImage(c->dst.dpy, c->dst.pixmap, c->dst.gc, &c->image,
+ 0, 0,
+ 0, 0,
+ clip->width, clip->height);
+ }
+ serial = NextRequest(c->dst.dpy);
+ XRenderComposite(c->dst.dpy, PictOpSrc,
+ c->dst.pix_picture, 0, c->dst.win_picture,
+ 0, 0,
+ 0, 0,
+ clip->x, clip->y,
+ clip->width, clip->height);
+ if (c->dst.has_shm)
+ send_shm(&c->dst, serial);
} else if (c->dst.pixmap) {
int serial = NextRequest(c->dst.dpy);
XCopyArea(c->dst.dpy, c->dst.pixmap, c->dst.window, c->dst.gc,
@@ -853,60 +940,6 @@ static void usage(const char *arg0)
printf("usage: %s [-d <source display>] [<target display>] <target output>...\n", arg0);
}
-static int bumblebee_open(struct display *display)
-{
- char buf[256];
- struct sockaddr_un addr;
- int fd, len;
-
- fd = socket(PF_UNIX, SOCK_STREAM | SOCK_CLOEXEC, 0);
- if (fd < 0)
- goto err;
-
- addr.sun_family = AF_UNIX;
- strcpy(addr.sun_path, optarg && *optarg ? optarg : "/var/run/bumblebee.socket");
- if (connect(fd, (struct sockaddr *)&addr, sizeof(addr)) < 0)
- goto err;
-
- /* Ask bumblebee to start the second server */
- buf[0] = 'C';
- if (send(fd, &buf, 1, 0) != 1 || (len = recv(fd, &buf, 255, 0)) <= 0) {
- close(fd);
- goto err;
- }
- buf[len] = '\0';
-
- /* Query the display name */
- strcpy(buf, "Q VirtualDisplay");
- if (send(fd, buf, 17, 0) != 17 || (len = recv(fd, buf, 255, 0)) <= 0)
- goto err;
- buf[len] = '\0';
- close(fd);
-
- if (strncmp(buf, "Value: ", 7))
- goto err;
-
- while (isspace(buf[--len]))
- buf[len] = '\0';
-
- display->dpy = XOpenDisplay(buf+7);
- if (display->dpy == NULL) {
- fprintf(stderr, "Unable to connect to bumblebee Xserver on %s\n", buf+7);
- return -ECONNREFUSED;
- }
-
- if (!XRRQueryExtension(display->dpy, &display->rr_event, &display->rr_error)) {
- fprintf(stderr, "RandR extension not supported by bumblebee Xserver\n");
- return -EINVAL;
- }
-
- return ConnectionNumber(display->dpy);
-
-err:
- fprintf(stderr, "Unable to connect to bumblebee\n");
- return -ECONNREFUSED;
-}
-
static void record_callback(XPointer closure, XRecordInterceptData *data)
{
struct context *ctx = (struct context *)closure;
@@ -979,8 +1012,53 @@ static int timer(int hz)
return fd;
}
-static int display_init(struct display *display, const char *name)
+static int display_init_core(struct display *display)
{
+ Display *dpy = display->dpy;
+ Visual *visual;
+ int major, minor;
+
+ display->root = DefaultRootWindow(dpy);
+
+ visual = DefaultVisual(dpy, DefaultScreen(dpy));
+ if (visual->bits_per_rgb != 8 ||
+ visual->red_mask != 0xff << 16 ||
+ visual->green_mask != 0xff << 8 ||
+ visual->blue_mask != 0xff << 0) {
+ DBG(("%s: has non-RGB24 visual, forcing render (bpp=%d, red=%lx, green=%lx, blue=%lx)\n",
+ DisplayString(dpy), visual->bits_per_rgb,
+ (long)visual->red_mask,
+ (long)visual->green_mask,
+ (long)visual->blue_mask));
+
+ if (!XRenderQueryVersion(dpy, &major, &minor)) {
+ fprintf(stderr, "Render extension not supported by %s\n", DisplayString(dpy));
+ return -EINVAL;
+ }
+
+ display->root_format = XRenderFindVisualFormat(dpy, visual);
+ display->rgb24_format = XRenderFindStandardFormat(dpy, PictStandardRGB24);
+
+ DBG(("%s: root=%x, rgb24=%x\n", DisplayString(dpy),
+ (int)display->root_format->id, (int)display->rgb24_format->id));
+ }
+
+ if (!XRRQueryExtension(dpy, &display->rr_event, &display->rr_error)) {
+ fprintf(stderr, "RandR extension not supported by %s\n", DisplayString(dpy));
+ return -EINVAL;
+ }
+
+
+ display->invisible_cursor = display_load_invisible_cursor(display);
+ display->cursor = None;
+
+ return 0;
+}
+
+static int display_open(struct display *display, const char *name)
+{
+ int ret;
+
DBG(("%s(%s)\n", __func__, name));
display->dpy = XOpenDisplay(name);
@@ -989,17 +1067,64 @@ static int display_init(struct display *display, const char *name)
return -ECONNREFUSED;
}
- display->root = DefaultRootWindow(display->dpy);
+ ret = display_init_core(display);
+ if (ret)
+ return ret;
- if (!XRRQueryExtension(display->dpy, &display->rr_event, &display->rr_error)) {
- fprintf(stderr, "RandR extension not supported by %s\n", DisplayString(display->dpy));
- return -EINVAL;
+ return ConnectionNumber(display->dpy);
+}
+
+static int bumblebee_open(struct display *display)
+{
+ char buf[256];
+ struct sockaddr_un addr;
+ int fd, len;
+
+ fd = socket(PF_UNIX, SOCK_STREAM | SOCK_CLOEXEC, 0);
+ if (fd < 0)
+ goto err;
+
+ addr.sun_family = AF_UNIX;
+ strcpy(addr.sun_path, optarg && *optarg ? optarg : "/var/run/bumblebee.socket");
+ if (connect(fd, (struct sockaddr *)&addr, sizeof(addr)) < 0)
+ goto err;
+
+ /* Ask bumblebee to start the second server */
+ buf[0] = 'C';
+ if (send(fd, &buf, 1, 0) != 1 || (len = recv(fd, &buf, 255, 0)) <= 0) {
+ close(fd);
+ goto err;
}
+ buf[len] = '\0';
- display->invisible_cursor = display_load_invisible_cursor(display);
- display->cursor = None;
+ /* Query the display name */
+ strcpy(buf, "Q VirtualDisplay");
+ if (send(fd, buf, 17, 0) != 17 || (len = recv(fd, buf, 255, 0)) <= 0)
+ goto err;
+ buf[len] = '\0';
+ close(fd);
+
+ if (strncmp(buf, "Value: ", 7))
+ goto err;
+
+ while (isspace(buf[--len]))
+ buf[len] = '\0';
+
+ display->dpy = XOpenDisplay(buf+7);
+ if (display->dpy == NULL) {
+ fprintf(stderr, "Unable to connect to bumblebee Xserver on %s\n", buf+7);
+ return -ECONNREFUSED;
+ }
+
+ len = display_init_core(display);
+ if (len)
+ return len;
return ConnectionNumber(display->dpy);
+
+err:
+ fprintf(stderr, "Unable to connect to bumblebee\n");
+ return -ECONNREFUSED;
}
static int display_init_damage(struct display *display)
@@ -1098,7 +1223,7 @@ int main(int argc, char **argv)
nfd = 1;
pfd->events = POLLIN;
- pfd->fd = display_init(&ctx.display[0], src_name);
+ pfd->fd = display_open(&ctx.display[0], src_name);
if (pfd->fd < 0)
return -pfd->fd;
@@ -1114,7 +1239,7 @@ int main(int argc, char **argv)
char buf[80];
if (strchr(argv[i], ':')) {
- pfd[nfd].fd = display_init(&ctx.display[ctx.num_display++], argv[i]);
+ pfd[nfd].fd = display_open(&ctx.display[ctx.num_display++], argv[i]);
if (pfd[nfd].fd < 0)
return -pfd[nfd].fd;
pfd[nfd].events = POLLIN;
@@ -1157,7 +1282,7 @@ int main(int argc, char **argv)
return ret;
}
- ret = clone_update_modes(&ctx.clones[ctx.num_clones].dst, &ctx.clones[ctx.num_clones].src);
+ ret = clone_update_dst(&ctx.clones[ctx.num_clones].dst, &ctx.clones[ctx.num_clones].src);
if (ret) {
fprintf(stderr, "Failed to clone output \"%s\" from display \"%s\"\n",
argv[i], DisplayString(ctx.display[nfd-1].dpy));
@@ -1187,6 +1312,7 @@ int main(int argc, char **argv)
while (1) {
XEvent e;
+ int reconfigure = 0;
ret = poll(pfd, nfd + enable_timer, -1);
if (ret <= 0)
@@ -1220,8 +1346,9 @@ int main(int argc, char **argv)
XFree(cur);
} else if (e.type == ctx.display[0].rr_event + RRScreenChangeNotify) {
- for (i = 0; i < ctx.num_clones; i++)
- (void)clone_output(&ctx.clones[i]);
+ reconfigure = 1;
+ if (!enable_timer)
+ enable_timer = read(pfd[nfd].fd, &count, sizeof(count)) > 0;
} else {
DBG(("unknown event %d\n", e.type));
}
@@ -1258,7 +1385,7 @@ int main(int argc, char **argv)
}
for (i = 0; i < ctx.num_clones; i++)
- clone_update(&ctx.clones[i]);
+ clone_update(&ctx.clones[i], reconfigure);
if (enable_timer && read(pfd[nfd].fd, &count, sizeof(count)) > 0 && count > 0) {
ret = 0;
More information about the xorg-commit
mailing list