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

Frank Binns frank.binns at imgtec.com
Fri Jun 10 10:30:11 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 fds. However, this does not apply when Wayland support isn't
enabled.

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

diff --git a/src/egl/drivers/dri2/platform_x11_dri3.c b/src/egl/drivers/dri2/platform_x11_dri3.c
index 9363a8a..80aac01 100644
--- a/src/egl/drivers/dri2/platform_x11_dri3.c
+++ b/src/egl/drivers/dri2/platform_x11_dri3.c
@@ -442,6 +442,7 @@ dri3_get_device_name(int fd)
 {
    char *ret = NULL;
 
+#ifdef HAVE_WAYLAND_PLATFORM
    ret = drmGetRenderDeviceNameFromFd(fd);
    if (ret)
       return ret;
@@ -455,6 +456,7 @@ dri3_get_device_name(int fd)
       _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");
    } else
+#endif
       ret = loader_get_device_name_for_fd(fd);
 
    return ret;
-- 
2.7.4



More information about the mesa-dev mailing list