diff options
| author | Jon TURNEY <jon.turney@dronecode.org.uk> | 2014-03-07 15:59:10 +0000 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2014-03-07 12:43:52 -0800 |
| commit | 5350ae1d38f3c69a26421e0866ede0d2ccc3aea4 (patch) | |
| tree | 9f871b2d7eeebf9501f87e597ec066b8281f805c /hw | |
| parent | 78e508c9379b3976ac8e76b7aaa90ba86ad4e443 (diff) | |
Fix xephyr build in --disable-glamor case
It broke after commit 9fe052d90cca90fdf750d3a45b151be2ac7f0ebd
"xephyr: Build support for rendering with glamor using a -glamor
option."
See http://tinderbox.x.org/builds/2014-03-07-0004/logs/xserver/#build
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Eric Anholt <eric@anholt.net>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/kdrive/ephyr/hostx.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/hw/kdrive/ephyr/hostx.c b/hw/kdrive/ephyr/hostx.c index 19c2ed20e..859becaa6 100644 --- a/hw/kdrive/ephyr/hostx.c +++ b/hw/kdrive/ephyr/hostx.c @@ -309,9 +309,11 @@ hostx_init(void) | XCB_EVENT_MASK_STRUCTURE_NOTIFY; EPHYR_DBG("mark"); +#ifdef GLAMOR if (ephyr_glamor) HostX.conn = ephyr_glamor_connect(); else +#endif HostX.conn = xcb_connect(NULL, &HostX.screen); if (xcb_connection_has_error(HostX.conn)) { fprintf(stderr, "\nXephyr cannot open host display. Is DISPLAY set?\n"); @@ -322,11 +324,12 @@ hostx_init(void) HostX.winroot = xscreen->root; HostX.gc = xcb_generate_id(HostX.conn); HostX.depth = xscreen->root_depth; - if (ephyr_glamor) { +#ifdef GLAMOR + if (ephyr_glamor) HostX.visual = ephyr_glamor_get_visual(); - } else { + else +#endif HostX.visual = xcb_aux_find_visual_by_id(xscreen,xscreen->root_visual); - } xcb_create_gc(HostX.conn, HostX.gc, HostX.winroot, 0, NULL); cookie_WINDOW_STATE = xcb_intern_atom(HostX.conn, FALSE, @@ -760,6 +763,7 @@ hostx_paint_rect(KdScreenInfo *screen, EPHYR_DBG("painting in screen %d\n", scrpriv->mynum); +#ifdef GLAMOR if (ephyr_glamor) { BoxRec box; RegionRec region; @@ -774,6 +778,7 @@ hostx_paint_rect(KdScreenInfo *screen, RegionUninit(®ion); return; } +#endif /* * Copy the image data updated by the shadow layer |