From 4317ca8e8898a890d38c3d0c1f36efda02284ae1 Mon Sep 17 00:00:00 2001
From: Andriy Rysin <arysin@gmail.com>
Date: Fri, 30 Sep 2011 18:23:22 -0400
Subject: [PATCH] Revert "Make kwin compile without OpenGL libs"

This reverts commit 940db4e348cf3ee016df04484616df7599504863.
---
 composite.cpp | 4 ----
 effects.cpp   | 2 --
 2 files changed, 6 deletions(-)

diff --git a/composite.cpp b/composite.cpp
index e770c258c8..a8bb42e254 100644
--- a/composite.cpp
+++ b/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/effects.cpp b/effects.cpp
index 3f77a85b2e..4f8116af3c 100644
--- a/effects.cpp
+++ b/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()