From 4de11937e6e5f2f7bdcd0daece35728590993209 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=98yvind=20Kol=C3=A5s?= Date: Mon, 3 Dec 2007 17:14:49 +0000 Subject: [PATCH] * clutter/clutter-shader.[ch]: do not include GL.h. --- ChangeLog | 4 ++++ clutter/clutter-shader.c | 14 +++++++------- clutter/clutter-shader.h | 2 -- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index dc54ec2db..f82354f64 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2007-12-03 Øyvind Kolås + + * clutter/clutter-shader.[ch]: do not include GL.h. + 2007-12-03 Øyvind Kolås Support for shaders in clutter. At the moment limited to drivers diff --git a/clutter/clutter-shader.c b/clutter/clutter-shader.c index 70eb81491..6f0074bad 100644 --- 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 2071749f2..848dae20e 100644 --- a/clutter/clutter-shader.h +++ b/clutter/clutter-shader.h @@ -28,7 +28,6 @@ #ifndef CLUTTER_SHADER_H #define CLUTTER_SHADER_H -#include #include #include @@ -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