From e5932ff214c3c919761710fd527bad8d4da5e308 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Gr=C3=A4=C3=9Flin?= <ubuntu@martin-graesslin.com>
Date: Sun, 5 Dec 2010 10:29:40 +0100
Subject: [PATCH] Make it compile again after rebasing on current trunk

---
 compositingprefs.cpp | 1 +
 options.cpp          | 2 ++
 scene_opengl_egl.cpp | 1 -
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/compositingprefs.cpp b/compositingprefs.cpp
index 9e78d9bccd..b322e6e6eb 100644
--- a/compositingprefs.cpp
+++ b/compositingprefs.cpp
@@ -255,6 +255,7 @@ void CompositingPrefs::applyDriverSpecificOptions()
     // Always recommend
     mRecommendCompositing = true;
 
+#ifndef KWIN_HAVE_OPENGLES
     GLPlatform *gl = GLPlatform::instance();
     mStrictBinding = !gl->supports( LooseBinding );
     if ( gl->driver() == Driver_Intel )
diff --git a/options.cpp b/options.cpp
index 4bf041651e..20abca59a3 100644
--- a/options.cpp
+++ b/options.cpp
@@ -58,6 +58,7 @@ int currentRefreshRate()
     if( options->refreshRate > 0 ) // use manually configured refresh rate
         rate = options->refreshRate;
 #ifdef KWIN_HAVE_OPENGL_COMPOSITING
+#ifndef KWIN_HAVE_OPENGLES
     else if ( GLPlatform::instance()->driver() == Driver_NVidia )
         {
         QProcess nvidia_settings;
@@ -75,6 +76,7 @@ int currentRefreshRate()
             }
         }
 #endif
+#endif
 #ifdef HAVE_XRANDR
     else if( Extensions::randrAvailable() )
         {
diff --git a/scene_opengl_egl.cpp b/scene_opengl_egl.cpp
index 3f3c48ddc8..5410cc7a5f 100644
--- a/scene_opengl_egl.cpp
+++ b/scene_opengl_egl.cpp
@@ -279,7 +279,6 @@ void SceneOpenGL::paintBackground(QRegion region)
 
 void SceneOpenGL::Texture::init()
     {
-    damaged = true;
     findTarget();
     }