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

Make kwin compile without OpenGL libs

Browse source 
REVIEW: 101418
This commit is contained in:
Andriy Rysin 2011-05-22 13:53:09 -04:00
parent 3bd58d49fa
commit e94f58dd1b
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

@ -676,6 +676,7 @@ void Toplevel::addDamage(int x, int y, int w, int h)
emit damaged(this, r); emit damaged(this, r);
// discard lanczos texture // discard lanczos texture
if (effect_window) { if (effect_window) {
#ifdef KWIN_HAVE_OPENGL_COMPOSITING
QVariant cachedTextureVariant = effect_window->data(LanczosCacheRole); QVariant cachedTextureVariant = effect_window->data(LanczosCacheRole);
if (cachedTextureVariant.isValid()) { if (cachedTextureVariant.isValid()) {
GLTexture *cachedTexture = static_cast< GLTexture*>(cachedTextureVariant.value<void*>()); GLTexture *cachedTexture = static_cast< GLTexture*>(cachedTextureVariant.value<void*>());
@ -683,6 +684,7 @@ void Toplevel::addDamage(int x, int y, int w, int h)
cachedTexture = 0; cachedTexture = 0;
effect_window->setData(LanczosCacheRole, QVariant()); effect_window->setData(LanczosCacheRole, QVariant());
} }
#endif
} }
workspace()->checkCompositeTimer(); workspace()->checkCompositeTimer();
} }
@ -697,6 +699,7 @@ void Toplevel::addDamageFull()
emit damaged(this, rect()); emit damaged(this, rect());
// discard lanczos texture // discard lanczos texture
if (effect_window) { if (effect_window) {
#ifdef KWIN_HAVE_OPENGL_COMPOSITING
QVariant cachedTextureVariant = effect_window->data(LanczosCacheRole); QVariant cachedTextureVariant = effect_window->data(LanczosCacheRole);
if (cachedTextureVariant.isValid()) { if (cachedTextureVariant.isValid()) {
GLTexture *cachedTexture = static_cast< GLTexture*>(cachedTextureVariant.value<void*>()); GLTexture *cachedTexture = static_cast< GLTexture*>(cachedTextureVariant.value<void*>());
@ -704,6 +707,7 @@ void Toplevel::addDamageFull()
cachedTexture = 0; cachedTexture = 0;
effect_window->setData(LanczosCacheRole, QVariant()); effect_window->setData(LanczosCacheRole, QVariant());
} }
#endif
} }
workspace()->checkCompositeTimer(); workspace()->checkCompositeTimer();
} }

2
effects.cpp
View file

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