From faa86c24645d795ecffcd8636f174b83f1c13921 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Gr=C3=A4=C3=9Flin?= <ubuntu@martin-graesslin.com>
Date: Tue, 14 Sep 2010 21:41:55 +0200
Subject: [PATCH] We do not need to resolve extensions in OpenGL ES.

Therefore the kwinglutils_funcs.h includes just GLES/gl.h and
the .cpp does not do anything
---
 lib/kwinglutils_funcs.cpp | 2 ++
 lib/kwinglutils_funcs.h   | 6 ++++++
 2 files changed, 8 insertions(+)

diff --git a/lib/kwinglutils_funcs.cpp b/lib/kwinglutils_funcs.cpp
index 4d03ca5fc3..5f007d0a30 100644
--- a/lib/kwinglutils_funcs.cpp
+++ b/lib/kwinglutils_funcs.cpp
@@ -33,6 +33,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     function = (function ## _func)getProcAddress( #backup );
 
 #ifdef KWIN_HAVE_OPENGL
+#ifndef KWIN_HAVE_OPENGLES
 
 namespace KWin
 {
@@ -297,3 +298,4 @@ void glResolveFunctions()
 } // namespace
 
 #endif
+#endif
diff --git a/lib/kwinglutils_funcs.h b/lib/kwinglutils_funcs.h
index 98ff25f9d4..7f60108b3a 100644
--- a/lib/kwinglutils_funcs.h
+++ b/lib/kwinglutils_funcs.h
@@ -29,6 +29,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifdef KWIN_HAVE_OPENGL
 
+#ifndef KWIN_HAVE_OPENGLES
+
 // gcc-3.3.3 apparently cannot resolve KWin's namespaced versions properly,
 // so hide possible global functions
 #define glXQueryDrawable kwinhide_glXQueryDrawable
@@ -345,6 +347,10 @@ extern KWIN_EXPORT glVertexAttribPointer_func glVertexAttribPointer;
 
 } // namespace
 
+#else
+#include <GLES/gl.h>
+#endif
+
 #endif
 
 #endif