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

kwin: Check that color correction is enabled in setupForOutput()

Browse source 
Return early if color correction is disabled, so this function
becomes a no-op in that case.
This commit is contained in:
Fredrik Höglund 2013-06-11 20:49:54 +02:00
parent 209e44cad2
commit 9d03e16c34
1 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
libkwineffects/kwinglcolorcorrection.cpp
View file

@ -327,7 +327,7 @@ void ColorCorrection::setupForOutput(int screen)
{
Q_D(ColorCorrection);
if (d->m_hasError)
if (!d->m_enabled || d->m_hasError)
return;
// Clear any previous GL errors
@ -348,9 +348,6 @@ void ColorCorrection::setupForOutput(int screen)
}
if (!shader->setUniform("u_ccLookupTexture", d->m_ccTextureUnit)) {
// This means the color correction shaders are probably not loaded
if (!d->m_enabled)
return;
kError(1212) << "unable to set uniform for the color correction lookup texture";
d->m_hasError = true;
emit errorOccured();