summaryrefslogtreecommitdiff
path: root/hw
diff options
context:
space:
mode:
authorOlivier Fourdan <ofourdan@redhat.com>2015-02-02 10:41:06 +0100
committerAdam Jackson <ajax@redhat.com>2015-06-03 09:05:36 -0400
commite2bddc36af1b848974b67964b4fe4deaa79b786c (patch)
tree8223f5dcf88c584873789acbf4f2e5c36c1dab60 /hw
parente2c6135179ef0fa1b9db33f2d78e138fae233b56 (diff)
ephyr: Fail if glamor is requested but not usable
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com> Signed-off-by: Eric Anholt <eric@anholt.net> Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Eric Anholt <eric@anholt.net> (cherry picked from commit 251a067993658fd02f158fef36476f898c238e3c)
Diffstat (limited to 'hw')
-rw-r--r--hw/kdrive/ephyr/hostx.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/hw/kdrive/ephyr/hostx.c b/hw/kdrive/ephyr/hostx.c
index 15edce890..d6214e5ec 100644
--- a/hw/kdrive/ephyr/hostx.c
+++ b/hw/kdrive/ephyr/hostx.c
@@ -1407,9 +1407,12 @@ ephyr_glamor_init(ScreenPtr screen)
ephyr_glamor_set_window_size(scrpriv->glamor,
scrpriv->win_width, scrpriv->win_height);
- glamor_init(screen,
- GLAMOR_USE_SCREEN |
- GLAMOR_USE_PICTURE_SCREEN);
+ if (!glamor_init(screen,
+ GLAMOR_USE_SCREEN |
+ GLAMOR_USE_PICTURE_SCREEN)) {
+ FatalError("Failed to initialize glamor\n");
+ return FALSE;
+ }
return TRUE;
}