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

Revert "Make kwin compile without OpenGL libs"

Browse source 
This reverts commit 940db4e348cf3ee016df04484616df7599504863.
This commit is contained in:
Andriy Rysin 2011-09-30 18:23:22 -04:00
parent 81ac707969
commit 4317ca8e88
2 changed files with 0 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
composite.cpp
View file

@ -676,7 +676,6 @@ 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*>());
@ -684,7 +683,6 @@ 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();
} }
@ -699,7 +697,6 @@ 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*>());
@ -707,7 +704,6 @@ 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,13 +1286,11 @@ 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()