brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Øyvind Kolås 2007-12-03 17:14:49 +00:00
parent e92b864dff
commit 4de11937e6
3 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
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> 2007-12-03 Øyvind Kolås <pippin@o-hand.com>
Support for shaders in clutter. At the moment limited to drivers Support for shaders in clutter. At the moment limited to drivers

14
clutter/clutter-shader.c
View File

@ -57,16 +57,16 @@ static void clutter_shader_get_property (GObject *object,
struct _ClutterShaderPrivate struct _ClutterShaderPrivate
{ {
gboolean glsl; /* The shader is a GLSL shader */ gboolean glsl; /* The shader is a GLSL shader */
gboolean bound; /* The shader is bound to the GL context */ gboolean bound; /* The shader is bound to the GL context */
gchar *vertex_shader_source; /* source (or asm) for vertex shader */ gchar *vertex_shader_source; /* source (or asm) for vertex shader */
gchar *fragment_shader_source;/* source (or asm) for fragment shader*/ gchar *fragment_shader_source;/* source (or asm) for fragment shader*/
GLhandleARB program; COGLint program;
GLhandleARB vertex_shader; COGLint vertex_shader;
GLhandleARB fragment_shader; COGLint fragment_shader;
}; };
enum enum

2
clutter/clutter-shader.h
View File

@ -28,7 +28,6 @@
#ifndef CLUTTER_SHADER_H #ifndef CLUTTER_SHADER_H
#define CLUTTER_SHADER_H #define CLUTTER_SHADER_H
#include <GL/gl.h>
#include <glib.h> #include <glib.h>
#include <glib-object.h> #include <glib-object.h>
@ -72,7 +71,6 @@ void clutter_shader_set_uniform_1f (ClutterShader *self,
gfloat value); gfloat value);
/* should be private and internal */ /* should be private and internal */
void clutter_shader_release_all (void); void clutter_shader_release_all (void);
gboolean clutter_shader_has_glsl (void);
G_END_DECLS G_END_DECLS