From 04724a15b69c234ef52ba5dc71a32d1d25eb4367 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20L=C3=BCbking?= Date: Sun, 18 Jan 2015 00:29:50 +0100 Subject: [PATCH] do not query GLPlatform if not GL compositing BUG: 342982 REVIEW: 122120 --- effects/logout/logout.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/effects/logout/logout.cpp b/effects/logout/logout.cpp index cd37dbcbc8..f13e50a7d6 100644 --- a/effects/logout/logout.cpp +++ b/effects/logout/logout.cpp @@ -61,13 +61,15 @@ LogoutEffect::LogoutEffect() connect(effects, SIGNAL(windowDeleted(KWin::EffectWindow*)), this, SLOT(slotWindowDeleted(KWin::EffectWindow*))); connect(effects, SIGNAL(propertyNotify(KWin::EffectWindow*,long)), this, SLOT(slotPropertyNotify(KWin::EffectWindow*,long))); + if (effects->isOpenGLCompositing()) { #ifdef KWIN_HAVE_OPENGLES - const qint64 coreVersionNumber = kVersionNumber(3, 0); + const qint64 coreVersionNumber = kVersionNumber(3, 0); #else - const qint64 coreVersionNumber = kVersionNumber(1, 40); + const qint64 coreVersionNumber = kVersionNumber(1, 40); #endif - if (GLPlatform::instance()->glslVersion() >= coreVersionNumber) - m_shadersDir = QStringLiteral("kwin/shaders/1.40/"); + if (GLPlatform::instance()->glslVersion() >= coreVersionNumber) + m_shadersDir = QStringLiteral("kwin/shaders/1.40/"); + } } LogoutEffect::~LogoutEffect()