From 67d79385cf6682b190f41f41cc08f07757b154d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Gr=C3=A4=C3=9Flin?= Date: Tue, 1 Dec 2015 12:14:11 +0100 Subject: [PATCH] [effects] Drop resetting GenericShader from cube effect The cube effect no longer modifies any aspects of the GenericShader, thus there is no need to reset any values. --- effects/cube/cube.cpp | 7 ------- 1 file changed, 7 deletions(-) diff --git a/effects/cube/cube.cpp b/effects/cube/cube.cpp index bd9409f055..300beaad15 100644 --- a/effects/cube/cube.cpp +++ b/effects/cube/cube.cpp @@ -515,13 +515,6 @@ void CubeEffect::paintScreen(int mask, QRegion region, ScreenPaintData& data) desktopNameFrame->setText(effects->desktopName(frontDesktop)); desktopNameFrame->render(region, opacity); } - // restore the ScreenTransformation after all desktops are painted - // if not done GenericShader keeps the rotation data and transforms windows incorrectly in other rendering calls - if (effects->compositingType() == OpenGL2Compositing) { - GLShader *shader = ShaderManager::instance()->pushShader(KWin::ShaderManager::GenericShader); - shader->setUniform(GLShader::ScreenTransformation, QMatrix4x4()); - ShaderManager::instance()->popShader(); - } } else { effects->paintScreen(mask, region, data); }