From cb74d88037aa4949f1c1a9ec8bd83b15b01b2dea Mon Sep 17 00:00:00 2001 From: Laszlo Agocs Date: Tue, 6 May 2014 17:37:09 +0200 Subject: Set Chromium to EGL on eglfs too Don't try to use GLX on regular Linux builds when using eglfs. Change-Id: I491ab4931e3e26869069680aff6aaab499c61986 Reviewed-by: Jocelyn Turcotte --- src/core/web_engine_context.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/core/web_engine_context.cpp b/src/core/web_engine_context.cpp index e6c9f70cf..95bdce817 100644 --- a/src/core/web_engine_context.cpp +++ b/src/core/web_engine_context.cpp @@ -160,7 +160,8 @@ WebEngineContext::WebEngineContext() GLContextHelper::initialize(); // Tell Chromium to use EGL instead of GLX if the Qt xcb plugin also does. - if (qApp->platformName() == QStringLiteral("xcb") && qApp->platformNativeInterface()->nativeResourceForWindow(QByteArrayLiteral("egldisplay"), 0)) + if ((qApp->platformName() == QStringLiteral("xcb") || qApp->platformName() == QStringLiteral("eglfs")) + && qApp->platformNativeInterface()->nativeResourceForWindow(QByteArrayLiteral("egldisplay"), 0)) parsedCommandLine->AppendSwitchASCII(switches::kUseGL, gfx::kGLImplementationEGLName); content::UtilityProcessHost::RegisterUtilityMainThreadFactory(content::CreateInProcessUtilityThread); -- cgit v1.2.1