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

Define COGLhandleARB. (patch by Johan Bilien)

	* clutter/cogl/gles/cogl-defines.h: Define COGLhandleARB on
	GLES as well (using GLuint)

	* clutter/cogl/gles/cogl.c: Use COGLhandleARB.
This commit is contained in:
Emmanuele Bassi 2008-01-16 10:02:56 +00:00
parent 756ea6693f
commit 454b6011b6
3 changed files with 43 additions and 20 deletions

View File

@ -1,3 +1,12 @@
2008-01-16 Emmanuele Bassi <ebassi@openedhand.com>
Define COGLhandleARB. (patch by Johan Bilien)
* clutter/cogl/gles/cogl-defines.h: Define COGLhandleARB on
GLES as well (using GLuint)
* clutter/cogl/gles/cogl.c: Use COGLhandleARB.
2008-01-14 Tommi Komulainen <tommi.komulainen@iki.fi>
reviewed by: Emmanuele Bassi <ebassi@openedhand.com>

View File

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

View File

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