From 6199631604f9a654a2474ae55ccceafc5a87123f Mon Sep 17 00:00:00 2001 From: Rohan Garg Date: Tue, 4 Oct 2016 15:55:26 +0200 Subject: [PATCH] Check for EGL_KHR_platform_x11 in addition to EGL_EXT_platform_x11 Summary: Some platforms (like Mali) only report the newer EGL_KHR_platform_x11 on X11. Reviewers: kwin Subscribers: kwin Tags: #kwin Differential Revision: https://phabricator.kde.org/D2933 --- plugins/platforms/x11/common/eglonxbackend.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/plugins/platforms/x11/common/eglonxbackend.cpp b/plugins/platforms/x11/common/eglonxbackend.cpp index 35c401bfd1..43bf2649d8 100644 --- a/plugins/platforms/x11/common/eglonxbackend.cpp +++ b/plugins/platforms/x11/common/eglonxbackend.cpp @@ -181,8 +181,10 @@ bool EglOnXBackend::initRenderingContext() setHavePlatformBase(havePlatformBase); if (havePlatformBase) { // Make sure that the X11 platform is supported - if (!hasClientExtension(QByteArrayLiteral("EGL_EXT_platform_x11"))) { - qCWarning(KWIN_CORE) << "EGL_EXT_platform_base is supported, but EGL_EXT_platform_x11 is not. Cannot create EGLDisplay on X11"; + if (!hasClientExtension(QByteArrayLiteral("EGL_EXT_platform_x11")) && + !hasClientExtension(QByteArrayLiteral("EGL_KHR_platform_x11")) { + qCWarning(KWIN_CORE) << "EGL_EXT_platform_base is supported, but neither EGL_EXT_platform_x11 nor EGL_KHR_platform_x11 is supported." + << "Cannot create EGLDisplay on X11"; return false; }