[cogl/wip/cogl-1.14: 120/177] doc: Expose the Cogl GLES 2.0 facilities in the documentation



commit f13b5a4d57bf4581b27de415715dcafbcdfd1a44
Author: Damien Lespiau <damien lespiau intel com>
Date:   Sun Dec 30 15:14:34 2012 +0000

    doc: Expose the Cogl GLES 2.0 facilities in the documentation
    
    (cherry picked from commit 0c2344b9aafe4afdf7782fd9badc451de79b7a63)

 cogl/cogl-gles2.h                                  |    1 +
 .../cogl-2.0-experimental-docs.xml.in              |    1 +
 .../cogl-2.0-experimental-sections.txt             |   23 ++++++++++++++++++++
 3 files changed, 25 insertions(+), 0 deletions(-)
---
diff --git a/cogl/cogl-gles2.h b/cogl/cogl-gles2.h
index 01f55ed..e174112 100644
--- a/cogl/cogl-gles2.h
+++ b/cogl/cogl-gles2.h
@@ -107,6 +107,7 @@ typedef struct _CoglGLES2Vtable CoglGLES2Vtable;
 
 struct _CoglGLES2Vtable
 {
+  /*< private >*/
 #define COGL_EXT_BEGIN(name, \
                        min_gl_major, min_gl_minor, \
                        gles_availability, \
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 25828e7..9c90e21 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
@@ -147,6 +147,7 @@
       <xi:include href="xml/cogl-sdl.xml"/>
       <xi:include href="xml/cogl-poll.xml"/>
       <xi:include href="xml/cogl-gtype.xml"/>
+      <xi:include href="xml/cogl-gles2.xml"/>
     </section>
 
   </chapter>
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 43dc636..25915ee 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
@@ -855,3 +855,26 @@ cogl_sdl_handle_event
 cogl_sdl_idle
 cogl_sdl_onscreen_get_window
 </SECTION>
+
+<SECTION>
+<FILE>cogl-gles2</FILE>
+<TITLE>GLES 2.0 context</TITLE>
+
+<SUBSECTION>
+CoglGLES2Context
+CoglGLES2Vtable
+COGL_GLES2_CONTEXT_ERROR
+CoglGLES2ContextError
+cogl_gles2_context_new
+cogl_is_gles2_context
+
+<SUBSECTION>
+cogl_gles2_context_get_vtable
+cogl_push_gles2_context
+cogl_pop_gles2_context
+cogl_gles2_get_current_vtable
+
+<SUBSECTION>
+cogl_gles2_texture_2d_new_from_handle
+cogl_gles2_texture_get_handle
+</SECTION>



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]