From: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Mon, 24 Mar 2014 17:32:09 +0000 (+0000)
Subject: Fix ephyr build with --disable-glamor
X-Git-Tag: upstream/1.15.99.902~22^2~2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5870bd398d6073938d821c060eccf24adc07a2f1;p=platform%2Fupstream%2Fxorg-server.git

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>
---

diff --git a/hw/kdrive/ephyr/hostx.c b/hw/kdrive/ephyr/hostx.c
index 4f48770..435919e 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;