[docs] Small annotation fixes

This commit is contained in:
Emmanuele Bassi 2009-09-07 11:44:44 +01:00
parent 0b4837d8a2
commit d07ab704d4
2 changed files with 22 additions and 14 deletions

View File

@ -147,7 +147,8 @@ gboolean cogl_is_material (CoglHandle handle);
* *
* Since 1.0 * Since 1.0
*/ */
void cogl_material_set_color (CoglHandle material, const CoglColor *color); void cogl_material_set_color (CoglHandle material,
const CoglColor *color);
/** /**
* cogl_material_set_color4ub: * cogl_material_set_color4ub:
@ -198,7 +199,8 @@ void cogl_material_set_color4f (CoglHandle material,
* *
* Since 1.0 * Since 1.0
*/ */
void cogl_material_get_color (CoglHandle material, CoglColor *color); void cogl_material_get_color (CoglHandle material,
CoglColor *color);
/** /**
* cogl_material_set_ambient: * cogl_material_set_ambient:
@ -227,7 +229,8 @@ void cogl_material_set_ambient (CoglHandle material,
* *
* Since 1.0 * Since 1.0
*/ */
void cogl_material_get_ambient (CoglHandle material, CoglColor *ambient); void cogl_material_get_ambient (CoglHandle material,
CoglColor *ambient);
/** /**
* cogl_material_set_diffuse: * cogl_material_set_diffuse:
@ -255,7 +258,8 @@ void cogl_material_set_diffuse (CoglHandle material,
* *
* Since 1.0 * Since 1.0
*/ */
void cogl_material_get_diffuse (CoglHandle material, CoglColor *diffuse); void cogl_material_get_diffuse (CoglHandle material,
CoglColor *diffuse);
/** /**
* cogl_material_set_ambient_and_diffuse: * cogl_material_set_ambient_and_diffuse:
@ -299,7 +303,8 @@ void cogl_material_set_specular (CoglHandle material,
* *
* Since 1.0 * Since 1.0
*/ */
void cogl_material_get_specular (CoglHandle material, CoglColor *specular); void cogl_material_get_specular (CoglHandle material,
CoglColor *specular);
/** /**
* cogl_material_set_shininess: * cogl_material_set_shininess:
@ -353,7 +358,8 @@ void cogl_material_set_emission (CoglHandle material,
* *
* Since 1.0 * Since 1.0
*/ */
void cogl_material_get_emission (CoglHandle material, CoglColor *emission); void cogl_material_get_emission (CoglHandle material,
CoglColor *emission);
/** /**
* CoglMaterialAlphaFunc: * CoglMaterialAlphaFunc:
@ -505,8 +511,8 @@ gboolean cogl_material_set_blend (CoglHandle material,
* *
* Since: 1.0 * Since: 1.0
*/ */
void cogl_material_set_blend_constant (CoglHandle material, void cogl_material_set_blend_constant (CoglHandle material,
CoglColor *constant_color); CoglColor *constant_color);
/** /**
* cogl_material_set_layer: * cogl_material_set_layer:
@ -671,9 +677,10 @@ void cogl_material_set_layer_matrix (CoglHandle material,
* This function lets you access a materials internal list of layers * This function lets you access a materials internal list of layers
* for iteration. * for iteration.
* *
* Returns: A list of #CoglHandle<!-- -->'s that can be passed to the * Returns: (element-type Handle) (transfer none): A list of
* cogl_material_layer_* functions. The list is owned by COGL and it * #CoglHandle<!-- -->'s that can be passed to the cogl_material_layer_*
* should not be modified or freed * functions. The list is owned by COGL and it should not be modified or
* freed
*/ */
G_CONST_RETURN GList *cogl_material_get_layers (CoglHandle material); G_CONST_RETURN GList *cogl_material_get_layers (CoglHandle material);

View File

@ -245,9 +245,10 @@ gboolean cogl_texture_is_sliced (CoglHandle handle);
/** /**
* cogl_texture_get_gl_texture: * cogl_texture_get_gl_texture:
* @handle: a #CoglHandle for a texture. * @handle: a #CoglHandle for a texture.
* @out_gl_handle: pointer to return location for the textures GL handle, or * @out_gl_handle: (out) (allow-none): pointer to return location for the
* NULL. * textures GL handle, or %NULL.
* @out_gl_target: pointer to return location for the GL target type, or NULL. * @out_gl_target: (out) (allow-none): pointer to return location for the
* GL target type, or %NULL.
* *
* Query the GL handles for a GPU side texture through it's #CoglHandle, * Query the GL handles for a GPU side texture through it's #CoglHandle,
* if the texture is spliced the data for the first sub texture will be * if the texture is spliced the data for the first sub texture will be