From 6becc69ec90c2300d974e653ca50d2d33cf94c00 Mon Sep 17 00:00:00 2001 From: Simon Zeni Date: Tue, 26 Jan 2021 21:13:28 -0500 Subject: render/egl: fail to create wlr_egl on software renderer The creation of `wlr_egl` will fail is the device extension EGL_MESA_device_software is defined. The creation process is allowed to continue only if the environment variable `WLR_RENDERER_ALLOW_SOFTWARE` is defined to the value 1. --- docs/env_vars.md | 5 +++++ render/egl.c | 12 ++++++++++++ 2 files changed, 17 insertions(+) diff --git a/docs/env_vars.md b/docs/env_vars.md index 6ac87e07..aa4635cc 100644 --- a/docs/env_vars.md +++ b/docs/env_vars.md @@ -39,6 +39,11 @@ wlroots reads these environment variables * *WLR_X11_OUTPUTS*: when using the X11 backend specifies the number of outputs +## gles2 renderer + +* *WLR_RENDERER_ALLOW_SOFTWARE*: allows the gles2 renderer to use software + rendering + # Generic * *DISPLAY*: if set probe X11 backend in `wlr_backend_autocreate` diff --git a/render/egl.c b/render/egl.c index c1734a36..2eea387b 100644 --- a/render/egl.c +++ b/render/egl.c @@ -272,6 +272,18 @@ struct wlr_egl *wlr_egl_create(EGLenum platform, void *remote_display, goto error; } + if (check_egl_ext(device_exts_str, "EGL_MESA_device_software")) { + const char *allow_software = getenv("WLR_RENDERER_ALLOW_SOFTWARE"); + if (strcmp(allow_software, "1") == 0) { + wlr_log(WLR_INFO, "Using software rendering"); + } else { + wlr_log(WLR_ERROR, "Software rendering detected, please use " + "the WLR_RENDERER_ALLOW_SOFTWARE environment variable " + "to proceed"); + goto error; + } + } + egl->exts.device_drm_ext = check_egl_ext(device_exts_str, "EGL_EXT_device_drm"); } -- cgit v1.2.3