[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kde-workspace] kwin: Revert "Make kwin compile without OpenGL libs"
From:       Andriy Rysin <arysin () gmail ! com>
Date:       2011-09-30 22:36:14
Message-ID: 20110930223614.C44F7A60B9 () git ! kde ! org
[Download RAW message or body]

Git commit 18bae2fdb9f7ee561e2e0232038cdb292e23042d by Andriy Rysin.
Committed on 01/10/2011 at 00:23.
Pushed by rysin into branch 'master'.

Revert "Make kwin compile without OpenGL libs"

This reverts commit 940db4e348cf3ee016df04484616df7599504863.

M  +0    -4    kwin/composite.cpp
M  +0    -2    kwin/effects.cpp

http://commits.kde.org/kde-workspace/18bae2fdb9f7ee561e2e0232038cdb292e23042d

diff --git a/kwin/composite.cpp b/kwin/composite.cpp
index e770c25..a8bb42e 100644
--- a/kwin/composite.cpp
+++ b/kwin/composite.cpp
@@ -676,7 +676,6 @@ void Toplevel::addDamage(int x, int y, int w, int h)
     emit damaged(this, r);
     // discard lanczos texture
     if (effect_window) {
-#ifdef KWIN_HAVE_OPENGL_COMPOSITING
         QVariant cachedTextureVariant = effect_window->data(LanczosCacheRole);
         if (cachedTextureVariant.isValid()) {
             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;
             effect_window->setData(LanczosCacheRole, QVariant());
         }
-#endif
     }
     workspace()->checkCompositeTimer();
 }
@@ -699,7 +697,6 @@ void Toplevel::addDamageFull()
     emit damaged(this, rect());
     // discard lanczos texture
     if (effect_window) {
-#ifdef KWIN_HAVE_OPENGL_COMPOSITING
         QVariant cachedTextureVariant = effect_window->data(LanczosCacheRole);
         if (cachedTextureVariant.isValid()) {
             GLTexture *cachedTexture = static_cast< GLTexture*>(cachedTextureVariant.value<void*>());
@@ -707,7 +704,6 @@ void Toplevel::addDamageFull()
             cachedTexture = 0;
             effect_window->setData(LanczosCacheRole, QVariant());
         }
-#endif
     }
     workspace()->checkCompositeTimer();
 }
diff --git a/kwin/effects.cpp b/kwin/effects.cpp
index 3f77a85..4f8116a 100644
--- a/kwin/effects.cpp
+++ b/kwin/effects.cpp
@@ -1286,13 +1286,11 @@ 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()

[prev in list] [next in list] [prev in thread] [next in thread]