isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-06-13 16:59:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added COGLhandleARB since the underlying type on OSX is void*,

Browse Source 
patch from Tommi Komulainen <tommi.komulainen@iki.fi>, (#694)
* clutter/cogl/gl/cogl-defines.h.in: Added COGLhandleARB typedef.
* clutter/cogl/cogl.h:
* clutter/cogl/gl/cogl.c:
* clutter/clutter-shader.c: Use COGLhandleARB instead of COGLint when
referring to program or shader handles.
This commit is contained in:
Øyvind Kolås
2008-01-10 09:55:44 +00:00
parent f32911c519
commit 063386c1e2
5 changed files with 60 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
clutter/clutter-shader.c
View File

@ -68,19 +68,19 @@ typedef enum {
struct _ClutterShaderPrivate
{
guint bound : 1; /* The shader is bound to the GL context */
guint is_enabled : 1;
guint bound : 1; /* Shader is bound to the GL context */
guint is_enabled : 1;
guint vertex_is_glsl : 1;
guint fragment_is_glsl : 1;
guint vertex_is_glsl : 1;
guint fragment_is_glsl : 1;
gchar *vertex_source; /* source (or asm) for vertex shader */
gchar *fragment_source; /* source (or asm) for fragment shader */
gchar *vertex_source; /* GLSL source for vertex shader */
gchar *fragment_source; /* GLSL source for fragment shader */
COGLint program;
COGLhandleARB program;
COGLint vertex_shader;
COGLint fragment_shader;
COGLhandleARB vertex_shader;
COGLhandleARB fragment_shader;
};
enum