[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kwin] /: Pass EGL_PLATFORM=DRM to XWayland
From:       Martin_Gräßlin <null () kde ! org>
Date:       2016-12-23 15:22:10
Message-ID: E1cKRfe-0008HD-Tw () code ! kde ! org
[Download RAW message or body]

Git commit 58fa92e40bd3dd144101ed607b0030ed666b7083 by Martin Gräßlin.
Committed on 23/12/2016 at 15:18.
Pushed by graesslin into branch 'master'.

Pass EGL_PLATFORM=DRM to XWayland

XWayland needs to create an eglDisplay for platform DRM. Depending on
the mesa version eglInitialize expects that the passed native display
is a Wayland display and crashes. This prevents KWin to startup.

This patch sets EGL_PLATFORM for Xwayland. This is actually not KWin's
job, but if it otherwise crashes it's better than nothing.

As Xwayland only supports DRM, it's fine to use this.

M  +1    -0    main_wayland.cpp

https://commits.kde.org/kwin/58fa92e40bd3dd144101ed607b0030ed666b7083

diff --git a/main_wayland.cpp b/main_wayland.cpp
index ebc2c14a6..27ae35886 100644
--- a/main_wayland.cpp
+++ b/main_wayland.cpp
@@ -324,6 +324,7 @@ void ApplicationWayland::startXwaylandServer()
     m_xwaylandProcess->setProgram(QStringLiteral("Xwayland"));
     QProcessEnvironment env = m_environment;
     env.insert("WAYLAND_SOCKET", QByteArray::number(wlfd));
+    env.insert("EGL_PLATFORM", QByteArrayLiteral("DRM"));
     m_xwaylandProcess->setProcessEnvironment(env);
     m_xwaylandProcess->setArguments({QStringLiteral("-displayfd"),
                            QString::number(pipeFds[1]),
[prev in list] [next in list] [prev in thread] [next in thread]