From 124f30cccef75feabb0933c074753b392f373e82 Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Fri, 12 Feb 2010 15:52:07 +0000 Subject: [PATCH] docs: Fixes for Cogl --- clutter/cogl/cogl/cogl-material.h | 1 + clutter/cogl/cogl/cogl-pixel-buffer.h | 2 +- doc/reference/cogl/Makefile.am | 3 ++- doc/reference/cogl/cogl-sections.txt | 8 ++++---- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/clutter/cogl/cogl/cogl-material.h b/clutter/cogl/cogl/cogl-material.h index f8660d03b..9b0b059df 100644 --- a/clutter/cogl/cogl/cogl-material.h +++ b/clutter/cogl/cogl/cogl-material.h @@ -91,6 +91,7 @@ cogl_material_new (void); /** * cogl_material_copy: + * @source: the handle for the material to copy * * Creates a new material handle with the configuration copied from the * source material. diff --git a/clutter/cogl/cogl/cogl-pixel-buffer.h b/clutter/cogl/cogl/cogl-pixel-buffer.h index 4c9956a3f..55311d22a 100644 --- a/clutter/cogl/cogl/cogl-pixel-buffer.h +++ b/clutter/cogl/cogl/cogl-pixel-buffer.h @@ -95,6 +95,7 @@ cogl_pixel_buffer_new_for_size (unsigned int width, gboolean cogl_is_pixel_buffer (CoglHandle handle); +#if 0 /* * cogl_pixel_buffer_set_region: * @buffer: the #CoglHandle of a pixel buffer @@ -115,7 +116,6 @@ cogl_is_pixel_buffer (CoglHandle handle); * Since: 1.2 * Stability: Unstable */ -#if 0 gboolean cogl_pixel_buffer_set_region (CoglHandle buffer, guint8 *data, diff --git a/doc/reference/cogl/Makefile.am b/doc/reference/cogl/Makefile.am index 053e268d4..c6cbe11f4 100644 --- a/doc/reference/cogl/Makefile.am +++ b/doc/reference/cogl/Makefile.am @@ -53,6 +53,7 @@ CFILE_GLOB=\ # Header files to ignore when scanning. # e.g. IGNORE_HFILES=gtkdebug.h gtkintl.h IGNORE_HFILES=\ + cogl-atlas.h \ cogl-atlas-texture-private.h \ cogl-bitmap-private.h \ cogl-blend-string.h \ @@ -74,7 +75,7 @@ IGNORE_HFILES=\ cogl-matrix-stack.h \ cogl-spans.h \ cogl-pixel-buffer-private.h \ - cogl-primitives.h \ + cogl-profile.h \ cogl-sub-texture-private.h \ cogl-texture-2d-private.h \ cogl-texture-2d-sliced-private.h \ diff --git a/doc/reference/cogl/cogl-sections.txt b/doc/reference/cogl/cogl-sections.txt index 39d2058f5..9a45a3d91 100644 --- a/doc/reference/cogl/cogl-sections.txt +++ b/doc/reference/cogl/cogl-sections.txt @@ -72,8 +72,11 @@ cogl_end_gl COGL_TYPE_ATTRIBUTE_TYPE COGL_TYPE_BLEND_STRING_ERROR +COGL_TYPE_BUFFER_ACCESS COGL_TYPE_BUFFER_BIT COGL_TYPE_BUFFER_TARGET +COGL_TYPE_BUFFER_UPDATE_HINT +COGL_TYPE_BUFFER_USAGE_HINT COGL_TYPE_DEBUG_FLAGS COGL_TYPE_DRIVER_ERROR COGL_TYPE_FEATURE_FLAGS @@ -335,9 +338,6 @@ cogl_angle_sin cogl_angle_tan -cogl_fixed_mul -cogl_fixed_div -cogl_fixed_mul_div cogl_double_to_fixed cogl_double_to_int cogl_double_to_unit @@ -445,6 +445,7 @@ cogl_material_set_shininess cogl_material_get_shininess CoglMaterialAlphaFunc cogl_material_set_alpha_test_function +COGL_BLEND_STRING_ERROR CoglBlendStringError cogl_material_set_blend cogl_material_set_blend_constant @@ -486,7 +487,6 @@ cogl_buffer_set_data cogl_pixel_buffer_new cogl_pixel_buffer_new_for_size -cogl_pixel_buffer_set_region cogl_is_pixel_buffer