isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-08-04 15:45:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

[cogl] Remove the COGL{enum,int,uint} typedefs

Browse Source 
COGLenum, COGLint and COGLuint which were simply typedefs for GL{enum,int,uint}
have been removed from the API and replaced with specialised enum typedefs, int
and unsigned int. These were causing problems for generating bindings and also
considered poor style.

The cogl texture filter defines CGL_NEAREST and CGL_LINEAR etc are now replaced
by a namespaced typedef 'CoglTextureFilter' so they should be replaced with
COGL_TEXTURE_FILTER_NEAREST and COGL_TEXTURE_FILTER_LINEAR etc.

The shader type defines CGL_VERTEX_SHADER and CGL_FRAGMENT_SHADER are handled by
a CoglShaderType typedef and should be replaced with COGL_SHADER_TYPE_VERTEX and
COGL_SHADER_TYPE_FRAGMENT.

cogl_shader_get_parameteriv has been replaced by cogl_shader_get_type and
cogl_shader_is_compiled. More getters can be added later if desired.
This commit is contained in:
Robert Bragg
2009-05-12 14:15:18 +01:00
parent cea711cc7e
commit 36cfb60307
22 changed files with 375 additions and 243 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
clutter/clutter-shader-types.c
View File

@@ -88,7 +88,7 @@ struct _ClutterShaderFloat
struct _ClutterShaderInt
{
gint size;
COGLint value[4];
int value[4];
};
struct _ClutterShaderMatrix
@@ -223,7 +223,7 @@ clutter_value_collect_shader_int (GValue *value,
guint collect_flags)
{
gint int_count = collect_values[0].v_int;
const COGLint *ints = collect_values[1].v_pointer;
const int *ints = collect_values[1].v_pointer;
if (!ints)
return g_strdup_printf ("value location for '%s' passed as NULL",
@@ -242,7 +242,7 @@ clutter_value_lcopy_shader_int (const GValue *value,
guint collect_flags)
{
gint *int_count = collect_values[0].v_pointer;
COGLint **ints = collect_values[1].v_pointer;
int **ints = collect_values[1].v_pointer;
ClutterShaderInt *shader_int = value->data[0].v_pointer;
if (!int_count || !ints)
@@ -250,7 +250,7 @@ clutter_value_lcopy_shader_int (const GValue *value,
G_VALUE_TYPE_NAME (value));
*int_count = shader_int->size;
*ints = g_memdup (shader_int->value, shader_int->size * sizeof (COGLint));
*ints = g_memdup (shader_int->value, shader_int->size * sizeof (int));
return NULL;
}
@@ -514,7 +514,7 @@ clutter_value_get_shader_float (const GValue *value,
*
* Since: 0.8
*/
G_CONST_RETURN COGLint *
G_CONST_RETURN int *
clutter_value_get_shader_int (const GValue *value,
gsize *length)
{