From e38024bcd98fad24ea540e1a6c30bc37e020fee5 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Wed, 26 Aug 2015 22:49:28 +0300 Subject: [PATCH] kwin: drop checks for now gone egl_wayland backend --- kwin/compositingprefs.cpp | 3 +-- kwin/scene_opengl.cpp | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/kwin/compositingprefs.cpp b/kwin/compositingprefs.cpp index fdc7d372..d6813922 100644 --- a/kwin/compositingprefs.cpp +++ b/kwin/compositingprefs.cpp @@ -139,8 +139,7 @@ void CompositingPrefs::detect() #ifndef KWIN_HAVE_OPENGLES // HACK: This is needed for AIGLX const bool forceIndirect = qstrcmp(qgetenv("LIBGL_ALWAYS_INDIRECT"), "1") == 0; - const bool forceEgl = qstrcmp(qgetenv("KWIN_OPENGL_INTERFACE"), "egl") == 0 || - qstrcmp(qgetenv("KWIN_OPENGL_INTERFACE"), "egl_wayland") == 0; + const bool forceEgl = qstrcmp(qgetenv("KWIN_OPENGL_INTERFACE"), "egl") == 0; if (!forceIndirect && !forceEgl && qstrcmp(qgetenv("KWIN_DIRECT_GL"), "1") != 0) { // Start an external helper program that initializes GLX and returns // 0 if we can use direct rendering, and 1 otherwise. diff --git a/kwin/scene_opengl.cpp b/kwin/scene_opengl.cpp index 005cce71..733b7db8 100644 --- a/kwin/scene_opengl.cpp +++ b/kwin/scene_opengl.cpp @@ -205,8 +205,7 @@ SceneOpenGL *SceneOpenGL::createScene() platformInterface = EglPlatformInterface; #else // check environment variable - if (qstrcmp(envOpenGLInterface, "egl") == 0 || - qstrcmp(envOpenGLInterface, "egl_wayland") == 0) { + if (qstrcmp(envOpenGLInterface, "egl") == 0) { kDebug(1212) << "Forcing EGL native interface through environment variable"; platformInterface = EglPlatformInterface; } -- 2.11.0