vitalif
/
kwin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix GL-less kwin compilation 

BUG: 277667
icc-effect-5.14.5
Thomas Lübking 2011-07-13 04:07:30 +02:00
parent 7057bb2c25
commit d20b841713
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
composite.cpp
View File

@ -686,6 +686,7 @@ void Toplevel::addDamage(int x, int y, int w, int h)
damageRatio = float(damageArea) / float(rect().width()*rect().height());
repaints_region += r;
emit damaged(this, r);
#ifdef KWIN_HAVE_OPENGL_COMPOSITING
// discard lanczos texture
if (effect_window) {
QVariant cachedTextureVariant = effect_window->data(LanczosCacheRole);
@ -696,6 +697,7 @@ void Toplevel::addDamage(int x, int y, int w, int h)
effect_window->setData(LanczosCacheRole, QVariant());
}
}
#endif
workspace()->checkCompositeTimer();
}
@ -707,6 +709,7 @@ void Toplevel::addDamageFull()
repaints_region = rect();
damageRatio = 1.0;
emit damaged(this, rect());
#ifdef KWIN_HAVE_OPENGL_COMPOSITING
// discard lanczos texture
if (effect_window) {
QVariant cachedTextureVariant = effect_window->data(LanczosCacheRole);
@ -717,6 +720,7 @@ void Toplevel::addDamageFull()
effect_window->setData(LanczosCacheRole, QVariant());
}
}
#endif
workspace()->checkCompositeTimer();
}

2
effects.cpp
View File

@ -1271,11 +1271,13 @@ EffectWindowImpl::EffectWindowImpl() : EffectWindow()
EffectWindowImpl::~EffectWindowImpl()
{
#ifdef KWIN_HAVE_OPENGL_COMPOSITING
QVariant cachedTextureVariant = data(LanczosCacheRole);
if (cachedTextureVariant.isValid()) {
GLTexture *cachedTexture = static_cast< GLTexture*>(cachedTextureVariant.value<void*>());
delete cachedTexture;
}
#endif
}
bool EffectWindowImpl::isPaintingEnabled()