* clutter/clutter-shader.[ch]: do not include GL.h.

diff --git a/ChangeLog b/ChangeLog
index dc54ec2..f82354f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2007-12-03  Øyvind Kolås  <pippin@o-hand.com>
 
+       * clutter/clutter-shader.[ch]: do not include GL.h.
+
+2007-12-03  Øyvind Kolås  <pippin@o-hand.com>
+
        Support for shaders in clutter. At the moment limited to drivers
        providing GLSL support.
 

diff --git a/clutter/clutter-shader.c b/clutter/clutter-shader.c
index 70eb814..6f0074b 100644 (file)
--- a/clutter/clutter-shader.c
+++ b/clutter/clutter-shader.c
@@ -57,16 +57,16 @@ static void     clutter_shader_get_property (GObject               *object,
 
 struct _ClutterShaderPrivate
 {
-  gboolean     glsl;   /* The shader is a GLSL shader */
-  gboolean     bound;  /* The shader is bound to the GL context */
+  gboolean  glsl;   /* The shader is a GLSL shader */
+  gboolean  bound;  /* The shader is bound to the GL context */
 
-  gchar       *vertex_shader_source;  /* source (or asm) for vertex shader  */
-  gchar       *fragment_shader_source;/* source (or asm) for fragment shader*/
+  gchar    *vertex_shader_source;  /* source (or asm) for vertex shader  */
+  gchar    *fragment_shader_source;/* source (or asm) for fragment shader*/
 
-  GLhandleARB  program;
+  COGLint   program;
 
-  GLhandleARB  vertex_shader;
-  GLhandleARB  fragment_shader;
+  COGLint   vertex_shader;
+  COGLint   fragment_shader;
 };
 
 enum 

diff --git a/clutter/clutter-shader.h b/clutter/clutter-shader.h
index 2071749..848dae2 100644 (file)
--- a/clutter/clutter-shader.h
+++ b/clutter/clutter-shader.h
@@ -28,7 +28,6 @@
 #ifndef CLUTTER_SHADER_H
 #define CLUTTER_SHADER_H
 
-#include <GL/gl.h>
 #include <glib.h>
 #include <glib-object.h>
 
@@ -72,7 +71,6 @@ void            clutter_shader_set_uniform_1f   (ClutterShader *self,
                                                  gfloat         value);
 /* should be private and internal */
 void            clutter_shader_release_all    (void);
-gboolean        clutter_shader_has_glsl         (void);
 
 
 G_END_DECLS