Attachment #378662 for bug #483332

Lines 637-643 cogl_blend_string_error_quark (void); Link Here

(-)a/cogl/cogl-types.h (-1 / +1 lines)
637	* requested. An example might be if you try to use too many texture	637	* requested. An example might be if you try to use too many texture
638	* layers in a single #CoglPipeline</para></listitem>	638	* layers in a single #CoglPipeline</para></listitem>
639	* <listitem><para>The driver does not support some	639	* <listitem><para>The driver does not support some
640	* configuration.</para></listiem>	640	* configuration.</para></listitem>
641	* </itemizedlist>	641	* </itemizedlist>
642	*	642	*
643	* Currently this is only used by Cogl API marked as experimental so	643	* Currently this is only used by Cogl API marked as experimental so

Lines 102-109 Link Here

(-)a/doc/reference/cogl-2.0-experimental/cogl-2.0-experimental-docs.xml.in (-3 / +1 lines)
102	<section id="cogl-primitive-apis">	102	<section id="cogl-primitive-apis">
103	<title>Geometry</title>	103	<title>Geometry</title>
104	<xi:include href="xml/cogl-primitive.xml"/>	104	<xi:include href="xml/cogl-primitive.xml"/>
105	<xi:include href="xml/cogl-paths.xml"/>	105	<xi:include href="xml/cogl-path-functions.xml"/>
106	<xi:include href="xml/cogl-rectangle.xml"/>
107	</section>	106	</section>
108		107
109	<section id="cogl-textures">	108	<section id="cogl-textures">
Lines 150-156 Link Here
150	<title>Binding and Integrating</title>	149	<title>Binding and Integrating</title>
151	<xi:include href="xml/cogl-sdl.xml"/>	150	<xi:include href="xml/cogl-sdl.xml"/>
152	<xi:include href="xml/cogl-poll.xml"/>	151	<xi:include href="xml/cogl-poll.xml"/>
153	<xi:include href="xml/cogl-gtype.xml"/>
154	<xi:include href="xml/cogl-gles2.xml"/>	152	<xi:include href="xml/cogl-gles2.xml"/>
155	</section>	153	</section>
156		154




    <xi:include href="xml/cogl-color.xml"/>
    <xi:include href="xml/cogl-texture.xml"/>
    <xi:include href="blend-strings.xml"/>
    <xi:include href="xml/cogl-material-compat.xml"/>
    <xi:include href="xml/cogl-primitives.xml"/>
    <xi:include href="xml/cogl-path.xml"/>
    <xi:include href="xml/cogl-path-functions.xml"/>
    <xi:include href="xml/cogl-clip-state.xml"/>
    <xi:include href="xml/cogl-vertex-buffer.xml"/>
    <xi:include href="xml/cogl-matrix.xml"/>
    <xi:include href="xml/cogl-shader.xml"/>
    <xi:include href="xml/cogl-offscreen.xml"/>
    <xi:include href="xml/cogl-bitmap.xml"/>
    <xi:include href="xml/cogl-fixed.xml"/>
    <xi:include href="xml/cogl-gtype.xml"/>

  </chapter>



    </section>

    <xi:include href="xml/cogl-deprecated.xml"/>
    <xi:include href="xml/cogl-texture-deprecated.xml"/>
    <xi:include href="xml/cogl-material-deprecated.xml"/>
    <xi:include href="xml/cogl-clipping-deprecated.xml"/>
    <xi:include href="xml/cogl-vertex-buffer-deprecated.xml"/>
    <xi:include href="xml/cogl-shaders-deprecated.xml"/>
    <xi:include href="xml/cogl-offscreen-deprecated.xml"/>

  </chapter>

  <chapter id="coglglossary">

Return to bug 483332

Lines 63-79 Link Here

(-)a/doc/reference/cogl/cogl-docs.xml.in (-13 / +5 lines)
63	<xi:include href="xml/cogl-color.xml"/>	63	<xi:include href="xml/cogl-color.xml"/>
64	<xi:include href="xml/cogl-texture.xml"/>	64	<xi:include href="xml/cogl-texture.xml"/>
65	<xi:include href="blend-strings.xml"/>	65	<xi:include href="blend-strings.xml"/>
66	<xi:include href="xml/cogl-material.xml"/>	66	<xi:include href="xml/cogl-material-compat.xml"/>
67	<xi:include href="xml/cogl-primitives.xml"/>	67	<xi:include href="xml/cogl-primitives.xml"/>
68	<xi:include href="xml/cogl-paths.xml"/>	68	<xi:include href="xml/cogl-path.xml"/>
69	<xi:include href="xml/cogl-clipping.xml"/>	69	<xi:include href="xml/cogl-path-functions.xml"/>
		70	<xi:include href="xml/cogl-clip-state.xml"/>
70	<xi:include href="xml/cogl-vertex-buffer.xml"/>	71	<xi:include href="xml/cogl-vertex-buffer.xml"/>
71	<xi:include href="xml/cogl-matrix.xml"/>	72	<xi:include href="xml/cogl-matrix.xml"/>
72	<xi:include href="xml/cogl-shaders.xml"/>	73	<xi:include href="xml/cogl-shader.xml"/>
73	<xi:include href="xml/cogl-offscreen.xml"/>	74	<xi:include href="xml/cogl-offscreen.xml"/>
74	<xi:include href="xml/cogl-bitmap.xml"/>	75	<xi:include href="xml/cogl-bitmap.xml"/>
75	<xi:include href="xml/cogl-fixed.xml"/>	76	<xi:include href="xml/cogl-fixed.xml"/>
76	<xi:include href="xml/cogl-gtype.xml"/>
77		77
78	</chapter>	78	</chapter>
79		79
Lines 119-132 Link Here
119		119
120	</section>	120	</section>
121		121
122	<xi:include href="xml/cogl-deprecated.xml"/>
123	<xi:include href="xml/cogl-texture-deprecated.xml"/>
124	<xi:include href="xml/cogl-material-deprecated.xml"/>
125	<xi:include href="xml/cogl-clipping-deprecated.xml"/>
126	<xi:include href="xml/cogl-vertex-buffer-deprecated.xml"/>
127	<xi:include href="xml/cogl-shaders-deprecated.xml"/>
128	<xi:include href="xml/cogl-offscreen-deprecated.xml"/>
129
130	</chapter>	122	</chapter>
131		123
132	<chapter id="coglglossary">	124	<chapter id="coglglossary">