diff options
| author | Damien Lespiau <damien.lespiau@intel.com> | 2012-12-31 16:08:12 +0000 |
|---|---|---|
| committer | Robert Bragg <robert@linux.intel.com> | 2013-01-22 17:48:15 +0000 |
| commit | 780b01f1c855f9eb512077bb32d5d2dd2b48e4a7 (patch) | |
| tree | dc30a423a10ee8366ac79fa81c6c0d2535c48903 /doc | |
| parent | 5c12c36c585db964edd4d8f3242b24d28ae2e3b8 (diff) | |
doc: Populate cogl-types a bit more and move it to the general section
I just added the general types creating warnings in the current state of the
documentation (ie the ones references by already documented functions)
and moved the section from the 'Utility' section to the 'General'
section which I believe is a better fit as they are used by more than
one type and not really utilities.
(cherry picked from commit c51b147789763863ef32482d7ffa936160ed7c93)
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/reference/cogl-2.0-experimental/cogl-2.0-experimental-docs.xml.in | 2 | ||||
| -rw-r--r-- | doc/reference/cogl-2.0-experimental/cogl-2.0-experimental-sections.txt | 37 |
2 files changed, 27 insertions, 12 deletions
diff --git a/doc/reference/cogl-2.0-experimental/cogl-2.0-experimental-docs.xml.in b/doc/reference/cogl-2.0-experimental/cogl-2.0-experimental-docs.xml.in index b2eff6a4..1ddf4f93 100644 --- a/doc/reference/cogl-2.0-experimental/cogl-2.0-experimental-docs.xml.in +++ b/doc/reference/cogl-2.0-experimental/cogl-2.0-experimental-docs.xml.in @@ -65,6 +65,7 @@ <title>General API concepts</title> <xi:include href="xml/cogl-object.xml"/> <xi:include href="xml/cogl-error.xml"/> + <xi:include href="xml/cogl-types.xml"/> </section> <section id="cogl-context-apis"> @@ -140,7 +141,6 @@ <xi:include href="xml/cogl-vector.xml"/> <xi:include href="xml/cogl-euler.xml"/> <xi:include href="xml/cogl-quaternion.xml"/> - <xi:include href="xml/cogl-types.xml"/> <xi:include href="xml/cogl-version.xml"/> </section> diff --git a/doc/reference/cogl-2.0-experimental/cogl-2.0-experimental-sections.txt b/doc/reference/cogl-2.0-experimental/cogl-2.0-experimental-sections.txt index eebc8f3e..d8abc6d4 100644 --- a/doc/reference/cogl-2.0-experimental/cogl-2.0-experimental-sections.txt +++ b/doc/reference/cogl-2.0-experimental/cogl-2.0-experimental-sections.txt @@ -21,6 +21,32 @@ COGL_GLIB_ERROR </SECTION> <SECTION> +<FILE>cogl-types</FILE> +<TITLE>Common Types</TITLE> +<SUBSECTION> +CoglVertexP2 +CoglVertexP3 +CoglVertexP2C4 +CoglVertexP3C4 +CoglVertexP2T2 +CoglVertexP3T2 +CoglVertexP2T2C4 +CoglVertexP3T2C4 +CoglVerticesMode + +<SUBSECTION> +CoglFuncPtr +CoglPixelFormat +CoglBufferTarget +CoglBufferBit +CoglAttributeType +CoglColorMask + +<SUBSECTION> +CoglBool +</SECTION> + +<SECTION> <FILE>cogl-renderer</FILE> <TITLE>CoglRenderer: Connect to a backend renderer</TITLE> cogl_renderer_new @@ -872,17 +898,6 @@ COGL_VERSION_GET_MICRO </SECTION> <SECTION> -<FILE>cogl-types</FILE> -<TITLE>Common Types</TITLE> -CoglFuncPtr -CoglPixelFormat -CoglBufferTarget -CoglBufferBit -CoglAttributeType -CoglColorMask -</SECTION> - -<SECTION> <FILE>cogl-gtype</FILE> <TITLE>GType Integration API</TITLE> cogl_gtype_matrix_get_type |