From 8a27050b4e7dbe87769ef5e8d578dc0c959bc3e5 Mon Sep 17 00:00:00 2001 From: Simon Zeni Date: Fri, 26 Mar 2021 12:33:37 -0400 Subject: [PATCH] render/egl: fail on EGL_MESA_device_software --- render/egl.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/render/egl.c b/render/egl.c index 5074e684..94f288f6 100644 --- a/render/egl.c +++ b/render/egl.c @@ -278,13 +278,10 @@ struct wlr_egl *wlr_egl_create(EGLenum platform, void *remote_display) { if (allow_software != NULL && strcmp(allow_software, "1") == 0) { wlr_log(WLR_INFO, "Using software rendering"); } else { - // Because of a Mesa bug, sometimes EGL_MESA_device_software is - // advertised for hardware renderers. See: - // https://gitlab.freedesktop.org/mesa/mesa/-/issues/4178 - // TODO: fail without WLR_RENDERER_ALLOW_SOFTWARE - wlr_log(WLR_INFO, "Warning: software rendering may be in use"); - wlr_log(WLR_INFO, "If you experience slow rendering, " - "please check the OpenGL drivers are correctly installed"); + wlr_log(WLR_ERROR, "Software rendering detected, please use " + "the WLR_RENDERER_ALLOW_SOFTWARE environment variable " + "to proceed"); + goto error; } }