diff options
| author | Robert Bragg <robert@linux.intel.com> | 2011-07-01 02:02:23 +0100 |
|---|---|---|
| committer | Robert Bragg <robert@linux.intel.com> | 2011-07-04 15:33:31 +0100 |
| commit | 94148717aa1608591d25f87c56419627aab2582a (patch) | |
| tree | fdf042cc9bb55fa7dbb5aa074fdbb244b4046bae | |
| parent | a3fa7f5d962013db7b38be925ae9d47c65cb3bd7 (diff) | |
| download | cogl-94148717aa1608591d25f87c56419627aab2582a.tar.gz | |
docs: update cogl-context 2.0 docs
This fixes the 2.0 reference manual Makefile to not ignore
cogl-context.h; it also adds cogl_context_new to cogl-sections.txt and
removes cogl_begin/end_gl. (For using raw GL with Cogl 2.0 the plan was
to add some API for creating additional GL contexts via some Cogl API
and a way to push/pop those contexts.)
Signed-off-by: Neil Roberts <neil@linux.intel.com>
| -rw-r--r-- | doc/reference/cogl-2.0-experimental/Makefile.am | 1 | ||||
| -rw-r--r-- | doc/reference/cogl-2.0-experimental/cogl-sections.txt | 3 |
2 files changed, 1 insertions, 3 deletions
diff --git a/doc/reference/cogl-2.0-experimental/Makefile.am b/doc/reference/cogl-2.0-experimental/Makefile.am index 576b939d..441e276e 100644 --- a/doc/reference/cogl-2.0-experimental/Makefile.am +++ b/doc/reference/cogl-2.0-experimental/Makefile.am @@ -97,7 +97,6 @@ IGNORE_HFILES=\ cogl-vertex-buffer-private.h \ cogl-blend-string.h \ cogl-clip-stack.h \ - cogl-context.h \ cogl-debug.h \ cogl-defines.h \ cogl-deprecated.h \ diff --git a/doc/reference/cogl-2.0-experimental/cogl-sections.txt b/doc/reference/cogl-2.0-experimental/cogl-sections.txt index 814a4390..d2c4f8bd 100644 --- a/doc/reference/cogl-2.0-experimental/cogl-sections.txt +++ b/doc/reference/cogl-2.0-experimental/cogl-sections.txt @@ -112,8 +112,6 @@ cogl_read_pixels <SUBSECTION> cogl_flush -cogl_begin_gl -cogl_end_gl <SUBSECTION Standard> COGL_TYPE_ATTRIBUTE_TYPE @@ -339,6 +337,7 @@ cogl_pop_framebuffer <TITLE>CoglOnscreen: The Onscreen Framebuffer Interface</TITLE> CoglOnscreen COGL_ONSCREEN +cogl_onscreen_new cogl_onscreen_x11_set_foreign_window_xid cogl_onscreen_x11_get_window_xid cogl_onscreen_x11_get_visual_xid |