diff options
| author | Jon TURNEY <jon.turney@dronecode.org.uk> | 2014-03-24 17:32:09 +0000 |
|---|---|---|
| committer | Jon TURNEY <jon.turney@dronecode.org.uk> | 2014-03-27 14:34:29 +0000 |
| commit | 5870bd398d6073938d821c060eccf24adc07a2f1 (patch) | |
| tree | 7eb9e6f2f0b797e3d8d65a385361294ae9e060af | |
| parent | 432fc37e2ca833f1ec3cb614cbdc3a7ae13f22b7 (diff) | |
Fix ephyr build with --disable-glamor
See http://tinderbox.x.org/builds/2014-03-23-0010/logs/xserver/#build
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Tested-by: Julien Cristau <jcristau@debian.org>
Reviewed-by: Julien Cristau <jcristau@debian.org>
| -rw-r--r-- | hw/kdrive/ephyr/hostx.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/hw/kdrive/ephyr/hostx.c b/hw/kdrive/ephyr/hostx.c index 4f48770a6..435919e0a 100644 --- a/hw/kdrive/ephyr/hostx.c +++ b/hw/kdrive/ephyr/hostx.c @@ -734,13 +734,16 @@ hostx_screen_init(KdScreenInfo *screen, scrpriv->win_width = width; scrpriv->win_height = height; +#ifdef GLAMOR if (ephyr_glamor) { *bytes_per_line = 0; *bits_per_pixel = 0; ephyr_glamor_set_window_size(scrpriv->glamor, scrpriv->win_width, scrpriv->win_height); return NULL; - } else if (host_depth_matches_server(scrpriv)) { + } else +#endif + if (host_depth_matches_server(scrpriv)) { *bytes_per_line = scrpriv->ximg->stride; *bits_per_pixel = scrpriv->ximg->bpp; |