diff --git a/effects/coverswitch/coverswitch.cpp b/effects/coverswitch/coverswitch.cpp index dcc6c80597..17b223be3c 100644 --- a/effects/coverswitch/coverswitch.cpp +++ b/effects/coverswitch/coverswitch.cpp @@ -68,10 +68,13 @@ CoverSwitchEffect::CoverSwitchEffect() captionFont.setPointSize(captionFont.pointSize() * 2); QString shadersDir = "kwin/shaders/1.10/"; -#ifndef KWIN_HAVE_OPENGLES - if (GLPlatform::instance()->glslVersion() >= kVersionNumber(1, 40)) - shadersDir = "kwin/shaders/1.40/"; +#ifdef KWIN_HAVE_OPENGLES + const qint64 coreVersionNumber = kVersionNumber(3, 0); +#else + const qint64 coreVersionNumber = kVersionNumber(1, 40); #endif + if (GLPlatform::instance()->glslVersion() >= coreVersionNumber) + shadersDir = "kwin/shaders/1.40/"; const QString fragmentshader = KGlobal::dirs()->findResource("data", shadersDir + "coverswitch-reflection.glsl"); m_reflectionShader = ShaderManager::instance()->loadFragmentShader(ShaderManager::GenericShader, fragmentshader); connect(effects, SIGNAL(windowClosed(KWin::EffectWindow*)), this, SLOT(slotWindowClosed(KWin::EffectWindow*))); diff --git a/effects/cube/cube.cpp b/effects/cube/cube.cpp index 4b240d447c..ace1428769 100644 --- a/effects/cube/cube.cpp +++ b/effects/cube/cube.cpp @@ -100,10 +100,13 @@ CubeEffect::CubeEffect() desktopNameFont.setBold(true); desktopNameFont.setPointSize(14); -#ifndef KWIN_HAVE_OPENGLES - if (GLPlatform::instance()->glslVersion() >= kVersionNumber(1, 40)) - m_shadersDir = "kwin/shaders/1.40/"; +#ifdef KWIN_HAVE_OPENGLES + const qint64 coreVersionNumber = kVersionNumber(3, 0); +#else + const qint64 coreVersionNumber = kVersionNumber(1, 40); #endif + if (GLPlatform::instance()->glslVersion() >= coreVersionNumber) + m_shadersDir = "kwin/shaders/1.40/"; const QString fragmentshader = KGlobal::dirs()->findResource("data", m_shadersDir + "cube-reflection.glsl"); m_reflectionShader = ShaderManager::instance()->loadFragmentShader(ShaderManager::GenericShader, fragmentshader); diff --git a/effects/invert/invert.cpp b/effects/invert/invert.cpp index ba453f63e1..c412e31644 100644 --- a/effects/invert/invert.cpp +++ b/effects/invert/invert.cpp @@ -73,10 +73,13 @@ bool InvertEffect::loadData() m_inited = true; QString shadersDir = "kwin/shaders/1.10/"; -#ifndef KWIN_HAVE_OPENGLES - if (GLPlatform::instance()->glslVersion() >= kVersionNumber(1, 40)) - shadersDir = "kwin/shaders/1.40/"; +#ifdef KWIN_HAVE_OPENGLES + const qint64 coreVersionNumber = kVersionNumber(3, 0); +#else + const qint64 coreVersionNumber = kVersionNumber(1, 40); #endif + if (GLPlatform::instance()->glslVersion() >= coreVersionNumber) + shadersDir = "kwin/shaders/1.40/"; const QString fragmentshader = KGlobal::dirs()->findResource("data", shadersDir + "invert.frag"); m_shader = ShaderManager::instance()->loadFragmentShader(ShaderManager::GenericShader, fragmentshader); diff --git a/effects/lookingglass/lookingglass.cpp b/effects/lookingglass/lookingglass.cpp index aaf1dc7c48..0892650bd5 100644 --- a/effects/lookingglass/lookingglass.cpp +++ b/effects/lookingglass/lookingglass.cpp @@ -117,10 +117,13 @@ bool LookingGlassEffect::loadData() } QString shadersDir = "kwin/shaders/1.10/"; -#ifndef KWIN_HAVE_OPENGLES - if (GLPlatform::instance()->glslVersion() >= kVersionNumber(1, 40)) - shadersDir = "kwin/shaders/1.40/"; +#ifdef KWIN_HAVE_OPENGLES + const qint64 coreVersionNumber = kVersionNumber(3, 0); +#else + const qint64 coreVersionNumber = kVersionNumber(1, 40); #endif + if (GLPlatform::instance()->glslVersion() >= coreVersionNumber) + shadersDir = "kwin/shaders/1.40/"; const QString fragmentshader = KGlobal::dirs()->findResource("data", shadersDir + "lookingglass.frag"); m_shader = ShaderManager::instance()->loadFragmentShader(ShaderManager::SimpleShader, fragmentshader); if (m_shader->isValid()) {