isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-01-10 11:42:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

2008-01-16 Emmanuele Bassi <ebassi@openedhand.com>

Browse Source 
* clutter/cogl/cogl.h: Rename COGLhandleARB to COGLhandle.

	* clutter/cogl/gl/cogl-defines.h.in:
	* clutter/cogl/gl/cogl.c: Update GL implementation of COGL.

	* clutter/cogl/gles/cogl-defines.h:
	* clutter/cogl/gles/cogl.c: Update GLES implementation of COGL.

	* clutter/clutter-shader.c: Fix ClutterShader to use the new
	COGLhandle type instead of COGLhandlerARB.
This commit is contained in:
Emmanuele Bassi 2008-01-16 10:38:05 +00:00
parent 454b6011b6
commit e2f72ae557
7 changed files with 81 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ChangeLog
View File

@ -1,3 +1,16 @@
2008-01-16 Emmanuele Bassi <ebassi@openedhand.com>
* clutter/cogl/cogl.h: Rename COGLhandleARB to COGLhandle.
* clutter/cogl/gl/cogl-defines.h.in:
* clutter/cogl/gl/cogl.c: Update GL implementation of COGL.
* clutter/cogl/gles/cogl-defines.h:
* clutter/cogl/gles/cogl.c: Update GLES implementation of COGL.
* clutter/clutter-shader.c: Fix ClutterShader to use the new
COGLhandle type instead of COGLhandlerARB.
2008-01-16 Emmanuele Bassi <ebassi@openedhand.com> 2008-01-16 Emmanuele Bassi <ebassi@openedhand.com>
Define COGLhandleARB. (patch by Johan Bilien) Define COGLhandleARB. (patch by Johan Bilien)

18
clutter/clutter-shader.c
View File

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

41
clutter/cogl/cogl.h
View File

@ -214,50 +214,50 @@ cogl_fog_set (const ClutterColor *fog_color,
ClutterFixed z_far); ClutterFixed z_far);
COGLhandleARB COGLhandle
cogl_create_shader (COGLenum shaderType); cogl_create_shader (COGLenum shaderType);
void void
cogl_shader_destroy (COGLhandleARB handle); cogl_shader_destroy (COGLhandle handle);
void void
cogl_shader_source (COGLhandleARB shader, cogl_shader_source (COGLhandle shader,
const gchar *source); const gchar *source);
void void
cogl_shader_compile (COGLhandleARB shader_handle); cogl_shader_compile (COGLhandle shader_handle);
void void
cogl_shader_get_info_log (COGLhandleARB handle, cogl_shader_get_info_log (COGLhandle handle,
guint size, guint size,
gchar *buffer); gchar *buffer);
void void
cogl_shader_get_parameteriv (COGLhandleARB handle, cogl_shader_get_parameteriv (COGLhandle handle,
COGLenum pname, COGLenum pname,
COGLint *dest); COGLint *dest);
COGLhandleARB COGLhandle
cogl_create_program (void); cogl_create_program (void);
void void
cogl_program_destroy (COGLhandleARB handle); cogl_program_destroy (COGLhandle handle);
void void
cogl_program_attach_shader (COGLhandleARB program_handle, cogl_program_attach_shader (COGLhandle program_handle,
COGLhandleARB shader_handle); COGLhandle shader_handle);
/* 0 to use none */ /* 0 to use none */
void void
cogl_program_link (COGLhandleARB program_handle); cogl_program_link (COGLhandle program_handle);
void void
cogl_program_use (COGLhandleARB program_handle); cogl_program_use (COGLhandle program_handle);
COGLint COGLint
cogl_program_get_uniform_location (COGLhandleARB program_int, cogl_program_get_uniform_location (COGLhandle program_int,
const gchar *uniform_name); const gchar *uniform_name);
void void
@ -268,4 +268,3 @@ cogl_program_uniform_1f (COGLint uniform_no,
G_END_DECLS G_END_DECLS
#endif /* __COGL_H__ */ #endif /* __COGL_H__ */

2
clutter/cogl/gl/cogl-defines.h.in
View File

@ -42,7 +42,7 @@ G_BEGIN_DECLS
typedef GLenum COGLenum; typedef GLenum COGLenum;
typedef GLint COGLint; typedef GLint COGLint;
typedef GLuint COGLuint; typedef GLuint COGLuint;
typedef GLhandleARB COGLhandleARB; typedef GLhandleARB COGLhandle;
/* FIXME + DOCUMENT */ /* FIXME + DOCUMENT */

38
clutter/cogl/gl/cogl.c
View File

@ -803,14 +803,14 @@ cogl_fog_set (const ClutterColor *fog_color,
#endif #endif
COGLhandleARB COGLhandle
cogl_create_program (void) cogl_create_program (void)
{ {
PROC (GLhandleARB, 0, glCreateProgramObjectARB, void); PROC (GLhandleARB, 0, glCreateProgramObjectARB, void);
return proc (); return proc ();
} }
COGLhandleARB COGLhandle
cogl_create_shader (COGLenum shaderType) cogl_create_shader (COGLenum shaderType)
{ {
PROC (GLhandleARB, 0, glCreateShaderObjectARB, GLenum); PROC (GLhandleARB, 0, glCreateShaderObjectARB, GLenum);
@ -818,68 +818,68 @@ cogl_create_shader (COGLenum shaderType)
} }
void void
cogl_shader_source (COGLhandleARB shader, cogl_shader_source (COGLhandle shader,
const gchar *source) const gchar *source)
{ {
PROC (GLvoid,, glShaderSourceARB, GLhandleARB, GLsizei, const GLcharARB **, const GLint *) PROC (GLvoid,, glShaderSourceARB, GLhandleARB, GLsizei, const GLcharARB **, const GLint *)
proc (shader, 1, &source, NULL); proc (shader, 1, &source, NULL);
} }
void void
cogl_shader_compile (COGLhandleARB shader_handle) cogl_shader_compile (COGLhandle shader_handle)
{ {
PROC (GLvoid,, glCompileShaderARB, GLhandleARB); PROC (GLvoid,, glCompileShaderARB, GLhandleARB);
proc (shader_handle); proc (shader_handle);
} }
void void
cogl_program_attach_shader (COGLhandleARB program_handle, cogl_program_attach_shader (COGLhandle program_handle,
COGLhandleARB shader_handle) COGLhandle shader_handle)
{ {
PROC (GLvoid,, glAttachObjectARB, GLhandleARB, GLhandleARB); PROC (GLvoid,, glAttachObjectARB, GLhandleARB, GLhandleARB);
proc (program_handle, shader_handle); proc (program_handle, shader_handle);
} }
void void
cogl_program_link (COGLhandleARB program_handle) cogl_program_link (COGLhandle program_handle)
{ {
PROC (GLvoid,, glLinkProgramARB, GLhandleARB); PROC (GLvoid,, glLinkProgramARB, GLhandleARB);
proc (program_handle); proc (program_handle);
} }
void void
cogl_program_use (COGLhandleARB program_handle) cogl_program_use (COGLhandle program_handle)
{ {
PROC (GLvoid,, glUseProgramObjectARB, GLhandleARB); PROC (GLvoid,, glUseProgramObjectARB, GLhandleARB);
proc (program_handle); proc (program_handle);
} }
COGLint COGLint
cogl_program_get_uniform_location (COGLhandleARB program_handle, cogl_program_get_uniform_location (COGLhandle program_handle,
const gchar *uniform_name) const gchar *uniform_name)
{ {
PROC (GLint,0, glGetUniformLocationARB, GLhandleARB, const GLcharARB *) PROC (GLint,0, glGetUniformLocationARB, GLhandleARB, const GLcharARB *)
return proc (program_handle, uniform_name); return proc (program_handle, uniform_name);
} }
void void
cogl_program_destroy (COGLhandleARB handle) cogl_program_destroy (COGLhandle handle)
{ {
PROC (GLvoid,, glDeleteObjectARB, GLhandleARB); PROC (GLvoid,, glDeleteObjectARB, GLhandleARB);
proc (handle); proc (handle);
} }
void void
cogl_shader_destroy (COGLhandleARB handle) cogl_shader_destroy (COGLhandle handle)
{ {
PROC (GLvoid,, glDeleteObjectARB, GLhandleARB); PROC (GLvoid,, glDeleteObjectARB, GLhandleARB);
proc (handle); proc (handle);
} }
void void
cogl_shader_get_info_log (COGLhandleARB handle, cogl_shader_get_info_log (COGLhandle handle,
guint size, guint size,
gchar *buffer) gchar *buffer)
{ {
COGLint len; COGLint len;
PROC (GLvoid,, glGetInfoLogARB, GLhandleARB, GLsizei, GLsizei *, GLcharARB *); PROC (GLvoid,, glGetInfoLogARB, GLhandleARB, GLsizei, GLsizei *, GLcharARB *);
@ -888,9 +888,9 @@ cogl_shader_get_info_log (COGLhandleARB handle,
} }
void void
cogl_shader_get_parameteriv (COGLhandleARB handle, cogl_shader_get_parameteriv (COGLhandle handle,
COGLenum pname, COGLenum pname,
COGLint *dest) COGLint *dest)
{ {
PROC (GLvoid,, glGetObjectParameterivARB, GLhandleARB, GLenum, GLint*) PROC (GLvoid,, glGetObjectParameterivARB, GLhandleARB, GLenum, GLint*)
proc (handle, pname, dest); proc (handle, pname, dest);

2
clutter/cogl/gles/cogl-defines.h
View File

@ -440,7 +440,7 @@ G_BEGIN_DECLS
typedef GLenum COGLenum; typedef GLenum COGLenum;
typedef GLint COGLint; typedef GLint COGLint;
typedef GLuint COGLuint; typedef GLuint COGLuint;
typedef GLuint COGLhandleARB; typedef GLuint COGLhandle;
/* extras */ /* extras */

36
clutter/cogl/gles/cogl.c
View File

@ -645,73 +645,73 @@ cogl_fog_set (const ClutterColor *fog_color,
glFogx (GL_FOG_END, (GLfixed) z_far); glFogx (GL_FOG_END, (GLfixed) z_far);
} }
COGLhandleARB COGLhandle
cogl_create_program (void) cogl_create_program (void)
{ {
return 0; return 0;
} }
COGLhandleARB COGLhandle
cogl_create_shader (COGLenum shaderType) cogl_create_shader (COGLenum shaderType)
{ {
return 0; return 0;
} }
void void
cogl_shader_source (COGLhandleARB shader, cogl_shader_source (COGLhandle shader,
const gchar *source) const gchar *source)
{ {
} }
void void
cogl_shader_compile (COGLhandleARB shader_handle) cogl_shader_compile (COGLhandle shader_handle)
{ {
} }
void void
cogl_program_attach_shader (COGLhandleARB program_handle, cogl_program_attach_shader (COGLhandle program_handle,
COGLhandleARB shader_handle) COGLhandle shader_handle)
{ {
} }
void void
cogl_program_link (COGLhandleARB program_handle) cogl_program_link (COGLhandle program_handle)
{ {
} }
void void
cogl_program_use (COGLhandleARB program_handle) cogl_program_use (COGLhandle program_handle)
{ {
} }
COGLint COGLint
cogl_program_get_uniform_location (COGLhandleARB program_handle, cogl_program_get_uniform_location (COGLhandle program_handle,
const gchar *uniform_name) const gchar *uniform_name)
{ {
return 0; return 0;
} }
void void
cogl_program_destroy (COGLhandleARB handle) cogl_program_destroy (COGLhandle handle)
{ {
} }
void void
cogl_shader_destroy (COGLhandleARB handle) cogl_shader_destroy (COGLhandle handle)
{ {
} }
void void
cogl_shader_get_info_log (COGLhandleARB handle, cogl_shader_get_info_log (COGLhandle handle,
guint size, guint size,
gchar *buffer) gchar *buffer)
{ {
} }
void void
cogl_shader_get_parameteriv (COGLhandleARB handle, cogl_shader_get_parameteriv (COGLhandle handle,
COGLenum pname, COGLenum pname,
COGLint *dest) COGLint *dest)
{ {
} }