[Mesa-dev] [PATCH v2] egl/x11_dri3: stop restricting support to render nodes unnecessarily

Frank Binns frank.binns at imgtec.com
Fri Jun 10 16:35:52 UTC 2016


In order to support the WL_bind_wayland_display extension it's necessary to
make use of render nodes, as DRI3 doesn't provide a mechanism for authenticating
client opened device node fds. However, this doesn't apply when Wayland support
is disabled, since the extension is no longer exposed.

Changes since v1:
- Make HAVE_WAYLAND_PLATFORM less inclusive (Martin Peres)
- Enhance DRI3 disabled warning (Martin Peres)
- Update commit message

Signed-off-by: Frank Binns <frank.binns at imgtec.com>
---
 src/egl/drivers/dri2/platform_x11_dri3.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/egl/drivers/dri2/platform_x11_dri3.c b/src/egl/drivers/dri2/platform_x11_dri3.c
index 9363a8a..6c05956 100644
--- a/src/egl/drivers/dri2/platform_x11_dri3.c
+++ b/src/egl/drivers/dri2/platform_x11_dri3.c
@@ -451,10 +451,13 @@ dri3_get_device_name(int fd)
     * support, fall back to dri2. User can override it with environment
     * variable if they don't need to use that extension.
     */
+#ifdef HAVE_WAYLAND_PLATFORM
    if (getenv("EGL_FORCE_DRI3") == NULL) {
       _eglLog(_EGL_WARNING, "Render node support not available, falling back to dri2");
       _eglLog(_EGL_WARNING, "If you want to force dri3, set EGL_FORCE_DRI3 environment variable");
+      _eglLog(_EGL_WARNING, "Alternatively, you can rebuild Mesa without Wayland support");
    } else
+#endif
       ret = loader_get_device_name_for_fd(fd);
 
    return ret;
-- 
2.7.4



More information about the mesa-dev mailing list