You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
41 lines
1.5 KiB
41 lines
1.5 KiB
From 74cd913b98ddeaffdccc97735c017fae660e101b Mon Sep 17 00:00:00 2001 |
|
From: Olivier Fourdan <ofourdan@redhat.com> |
|
Date: Thu, 2 Mar 2017 11:03:15 +0100 |
|
Subject: [PATCH xserver] xwayland: add envvar XWAYLAND_NO_GLAMOR |
|
|
|
Not all compositors allow for customizing the Xwayland command line, |
|
gnome-shell/mutter for example have the command line and path to |
|
Xwayland binary hardcoded, which makes it harder for users to disable |
|
glamor acceleration in Xwayland (glamor being used by default). |
|
|
|
Add an environment variable XWAYLAND_NO_GLAMOR to disable glamor support |
|
in Xwayland. |
|
|
|
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com> |
|
Reviewed-by: Eric Engestrom <eric.engestrom@imgtec.com> |
|
(cherry picked from commit 1089d5d518a315963a8cda6c7d47a0ce09de0979) |
|
--- |
|
hw/xwayland/xwayland-glamor.c | 7 +++++++ |
|
1 file changed, 7 insertions(+) |
|
|
|
diff --git a/hw/xwayland/xwayland-glamor.c b/hw/xwayland/xwayland-glamor.c |
|
index 63f230369..00c8334c5 100644 |
|
--- a/hw/xwayland/xwayland-glamor.c |
|
+++ b/hw/xwayland/xwayland-glamor.c |
|
@@ -583,6 +583,13 @@ Bool |
|
xwl_glamor_init(struct xwl_screen *xwl_screen) |
|
{ |
|
ScreenPtr screen = xwl_screen->screen; |
|
+ const char *no_glamor_env; |
|
+ |
|
+ no_glamor_env = getenv("XWAYLAND_NO_GLAMOR"); |
|
+ if (no_glamor_env && *no_glamor_env != '0') { |
|
+ ErrorF("Disabling glamor and dri3 support, XWAYLAND_NO_GLAMOR is set\n"); |
|
+ return FALSE; |
|
+ } |
|
|
|
if (xwl_screen->egl_context == EGL_NO_CONTEXT) { |
|
ErrorF("Disabling glamor and dri3, EGL setup failed\n"); |
|
-- |
|
2.13.5 |
|
|
|
|