Merge commit 'origin/master' into cogl-material

Conflicts:

	clutter/clutter-texture.c
	clutter/cogl/cogl-texture.h
	clutter/cogl/cogl.h.in
	clutter/cogl/common/Makefile.am
	clutter/cogl/gl/Makefile.am
	clutter/cogl/gles/Makefile.am
	clutter/cogl/gles/cogl-gles2-wrapper.c
	clutter/cogl/gles/cogl-gles2-wrapper.h

2 files changed, 37 insertions, 21 deletions

diff --git a/doc/reference/cogl/cogl-docs.sgml b/doc/reference/cogl/cogl-docs.sgml
index 7e2c0974..ea48e5a1 100644
--- a/doc/reference/cogl/cogl-docs.sgml
+++ b/doc/reference/cogl/cogl-docs.sgml
@@ -62,7 +62,7 @@
     <xi:include href="xml/cogl-offscreen.xml"/>
     <xi:include href="xml/cogl-fixed.xml"/>
     <xi:include href="xml/cogl-color.xml"/>
-    <xi:include href="xml/cogl-mesh.xml"/>
+    <xi:include href="xml/cogl-vertex-buffer.xml"/>
 
   </chapter>
 
diff --git a/doc/reference/cogl/cogl-sections.txt b/doc/reference/cogl/cogl-sections.txt
index b30cf9ef..a00db7c7 100644
--- a/doc/reference/cogl/cogl-sections.txt
+++ b/doc/reference/cogl/cogl-sections.txt
@@ -23,11 +23,10 @@ cogl_get_viewport
 cogl_push_matrix
 cogl_pop_matrix
 cogl_scale
-cogl_translatex
 cogl_translate
-cogl_rotatex
 cogl_rotate
 <SUBSECTION>
+CoglClipStackState
 cogl_clip_set
 cogl_clip_set_from_path
 cogl_clip_set_from_path_preserve
@@ -89,22 +88,28 @@ cogl_path_stroke
 cogl_path_stroke_preserve
 cogl_set_source_color
 cogl_set_source_color4ub
-cogl_set_source_color4x
+cogl_set_source_color4f
+cogl_color
 
 <SUBSECTION>
 cogl_rectangle
-cogl_rectanglex
 </SECTION>
 
 <SECTION>
 <FILE>cogl-texture</FILE>
 <TITLE>Textures</TITLE>
 CoglTextureVertex
+CoglTextureFlags
 cogl_texture_new_with_size
 cogl_texture_new_from_file
 cogl_texture_new_from_data
 cogl_texture_new_from_foreign
+cogl_texture_new_from_bitmap
 cogl_is_texture
+cogl_texture_ref
+cogl_texture_unref
+
+<SUBSECTION>
 cogl_texture_get_width
 cogl_texture_get_height
 cogl_texture_get_format
@@ -117,11 +122,18 @@ cogl_texture_get_gl_texture
 cogl_texture_get_data
 cogl_texture_set_filters
 cogl_texture_set_region
-cogl_texture_ref
-cogl_texture_unref
+
+<SUBSECTION>
 cogl_texture_rectangle
 cogl_texture_multiple_rectangles
 cogl_texture_polygon
+
+<SUBSECTION>
+CoglBitmap
+cogl_bitmap_new_from_file
+cogl_bitmap_free
+cogl_bitmap_get_size_from_file
+
 </SECTION>
 
 <SECTION>
@@ -145,6 +157,7 @@ cogl_program_link
 cogl_program_use
 cogl_program_get_uniform_location
 cogl_program_uniform_1f
+cogl_program_uniform_1i
 cogl_program_uniform_float
 cogl_program_uniform_int
 cogl_program_uniform_matrix
@@ -228,6 +241,7 @@ cogl_fixed_pow
 cogl_fixed_pow2
 cogl_fixed_sin
 cogl_fixed_sqrt
+cogl_fixed_tan
 
 <SUBSECTION>
 CoglAngle
@@ -257,7 +271,7 @@ cogl_color_copy
 cogl_color_free
 cogl_color_set_from_4ub
 cogl_color_set_from_4d
-cogl_color_set_from_4x
+cogl_color_set_from_4f
 
 <SUBSECTION>
 cogl_color_get_red
@@ -279,19 +293,21 @@ cogl_color_get_alpha_float
 </SECTION>
 
 <SECTION>
-<FILE>cogl-mesh</FILE>
-<TITLE>Mesh API</TITLE>
-cogl_mesh_new
-cogl_mesh_ref
-cogl_mesh_unref
-CoglMeshAttributeFlags
-cogl_mesh_add_attribute
-cogl_mesh_delete_attribute
-cogl_mesh_enable_attribute
-cogl_mesh_disable_attribute
-cogl_mesh_draw_arrays
-cogl_mesh_draw_range_elements
-cogl_mesh_submit
+<FILE>cogl-vertex-buffer</FILE>
+<TITLE>Vertex Buffers</TITLE>
+CoglVertexBufferAttribFlags
+COGL_VERTEX_BUFFER_ATTRIB_FLAG_GL_TYPE_MASK
+COGL_VERTEX_BUFFER_ATTRIB_FLAG_TYPE_MASK
+cogl_vertex_buffer_new
+cogl_vertex_buffer_ref
+cogl_vertex_buffer_unref
+cogl_vertex_buffer_add
+cogl_vertex_buffer_delete
+cogl_vertex_buffer_enable
+cogl_vertex_buffer_disable
+cogl_vertex_buffer_submit
+cogl_vertex_buffer_draw
+cogl_vertex_buffer_draw_range_elements
 </SECTION>
 
 <SECTION>