yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

do not query GLPlatform if not GL compositing

Browse source 
BUG: 342982
REVIEW: 122120
This commit is contained in:
Thomas Lübking 2015-01-18 00:29:50 +01:00
parent f82a6a545c
commit 04724a15b6
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
effects/logout/logout.cpp
View file

@ -61,13 +61,15 @@ LogoutEffect::LogoutEffect()
connect(effects, SIGNAL(windowDeleted(KWin::EffectWindow*)), this, SLOT(slotWindowDeleted(KWin::EffectWindow*))); connect(effects, SIGNAL(windowDeleted(KWin::EffectWindow*)), this, SLOT(slotWindowDeleted(KWin::EffectWindow*)));
connect(effects, SIGNAL(propertyNotify(KWin::EffectWindow*,long)), this, SLOT(slotPropertyNotify(KWin::EffectWindow*,long))); connect(effects, SIGNAL(propertyNotify(KWin::EffectWindow*,long)), this, SLOT(slotPropertyNotify(KWin::EffectWindow*,long)));
if (effects->isOpenGLCompositing()) {
#ifdef KWIN_HAVE_OPENGLES #ifdef KWIN_HAVE_OPENGLES
const qint64 coreVersionNumber = kVersionNumber(3, 0); const qint64 coreVersionNumber = kVersionNumber(3, 0);
#else #else
const qint64 coreVersionNumber = kVersionNumber(1, 40); const qint64 coreVersionNumber = kVersionNumber(1, 40);
#endif #endif
if (GLPlatform::instance()->glslVersion() >= coreVersionNumber) if (GLPlatform::instance()->glslVersion() >= coreVersionNumber)
m_shadersDir = QStringLiteral("kwin/shaders/1.40/"); m_shadersDir = QStringLiteral("kwin/shaders/1.40/");
}
} }
LogoutEffect::~LogoutEffect() LogoutEffect::~LogoutEffect()