[PATCH xserver 2/5] xwayland: "EGL_EXT_device_base" required for eglstream

Olivier Fourdan ofourdan at redhat.com
Thu May 24 14:11:00 UTC 2018


eglQueryDevicesEXT() would abort if the required extenon are not
available, meaning that enabling “-eglstream”on a non-EGL stream capable
hardware would lead to an abort().

Check that "EGL_EXT_device_base" extension is available and baild out
early if not, so we don't abort() later.

Signed-off-by: Olivier Fourdan <ofourdan at redhat.com>
---
 hw/xwayland/xwayland-glamor.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/hw/xwayland/xwayland-glamor.c b/hw/xwayland/xwayland-glamor.c
index cdca072ed..f543f321d 100644
--- a/hw/xwayland/xwayland-glamor.c
+++ b/hw/xwayland/xwayland-glamor.c
@@ -67,6 +67,9 @@ xwl_glamor_egl_get_devices(int *num_devices)
     int drm_dev_count = 0;
     int i;
 
+    if (!xwl_glamor_egl_supports_device_probing())
+        return NULL;
+
     /* Get the number of devices */
     ret = eglQueryDevicesEXT(0, NULL, num_devices);
     if (!ret || *num_devices < 1)
-- 
2.17.0



More information about the xorg-devel mailing list