From da80cba35c4da054d8745f3d9fabf134ab999364 Mon Sep 17 00:00:00 2001
From: "Aaron J. Seigo" <aseigo@kde.org>
Date: Sun, 6 May 2007 00:17:21 +0000
Subject: [PATCH] compile fixes; and now to find out why it thinks i don't have
 gl installed ;)

svn path=/trunk/KDE/kdebase/workspace/; revision=661574
---
 lib/kwinglutils.cpp | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/lib/kwinglutils.cpp b/lib/kwinglutils.cpp
index 45c801faa9..234afddcd7 100644
--- a/lib/kwinglutils.cpp
+++ b/lib/kwinglutils.cpp
@@ -119,21 +119,10 @@ int nearestPowerOfTwo( int x )
     return 1 << last;
     }
 
-void renderGLGeometry( const float* vertices, const float* texture, int count, int dim, int stride )
-    {
-    return renderGLGeometry( false, QRegion(), vertices, texture, count, dim, stride );
-    }
-
-void renderGLGeometry( int mask, QRegion region, const float* vertices, const float* texture, int count,
-    int dim, int stride )
-    {
-    return renderGLGeometry( !( mask & ( Effect::PAINT_WINDOW_TRANSFORMED | Effect::PAINT_SCREEN_TRANSFORMED )),
-        region, vertices, texture, count, dim, stride );
-    }
-
 void renderGLGeometry( bool clip, QRegion region, const float* vertices, const float* texture, int count,
     int dim, int stride )
     {
+#ifdef HAVE_OPENGL
     glPushAttrib( GL_ENABLE_BIT );
     glPushClientAttrib( GL_CLIENT_VERTEX_ARRAY_BIT );
     // Enable arrays
@@ -163,6 +152,19 @@ void renderGLGeometry( bool clip, QRegion region, const float* vertices, const f
         }
     glPopClientAttrib();
     glPopAttrib();
+#endif
+    }
+
+void renderGLGeometry( const float* vertices, const float* texture, int count, int dim, int stride )
+    {
+    renderGLGeometry( false, QRegion(), vertices, texture, count, dim, stride );
+    }
+
+void renderGLGeometry( int mask, QRegion region, const float* vertices, const float* texture, int count,
+    int dim, int stride )
+    {
+    renderGLGeometry( !( mask & ( Effect::PAINT_WINDOW_TRANSFORMED | Effect::PAINT_SCREEN_TRANSFORMED )),
+        region, vertices, texture, count, dim, stride );
     }
 
 #ifdef HAVE_OPENGL