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

cube: Always set the shader in WindowPaintData

Browse source 
The cube effect was relying on paintWindow() using the generic shader
without explicitly telling it to do so.  This makes the cube effect
work with dynamic shaders.
This commit is contained in:
Fredrik Höglund 2014-04-01 18:09:31 +02:00
parent ef5b1c7f59
commit 4394219cd6
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
effects/cube/cube.cpp
View file

@ -1354,7 +1354,6 @@ void CubeEffect::paintWindow(EffectWindow* w, int mask, QRegion region, WindowPa
if (stop)
factor = timeLine.currentValue();
cylinderShader->setUniform("timeLine", factor);
data.shader = cylinderShader;
currentShader = cylinderShader;
}
if (mode == Sphere) {
@ -1367,7 +1366,6 @@ void CubeEffect::paintWindow(EffectWindow* w, int mask, QRegion region, WindowPa
if (stop)
factor = timeLine.currentValue();
sphereShader->setUniform("timeLine", factor);
data.shader = sphereShader;
currentShader = sphereShader;
}
if (reflectionPainting) {
@ -1375,6 +1373,7 @@ void CubeEffect::paintWindow(EffectWindow* w, int mask, QRegion region, WindowPa
} else {
currentShader->setUniform(GLShader::ScreenTransformation, m_rotationMatrix*origMatrix);
}
data.shader = currentShader;
}
effects->paintWindow(w, mask, region, data);
if (activated && cube_painting) {