isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-23 00:20:42 -05: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 7f51bdda17
commit 801d55621e
5 changed files with 59 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
cogl.h
View File

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

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

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

38
gl/cogl.c
View File

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

2
gles/cogl-defines.h
View File

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

36
gles/cogl.c
View File

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