Neil Roberts 805b88d4c0 Merge branch multiple-texture-rectangle into master ... Bug 1289 - Draw multiple glyphs at once The multiple-texture-rectangle branch adds a new Cogl texture function called cogl_texture_multiple_rectangles which is used to draw multiple rectangles out of a texture using a single GL call. This is significantly faster than drawing the rectangles with individual calls on some platforms. The Pango renderer now uses this to speed up rendering. The conflicts are just due to the whitespace fixes in cb569a5. Conflicts: clutter/cogl/gl/cogl-context.c clutter/cogl/gl/cogl-context.h clutter/cogl/gl/cogl-texture.c		2009-01-07 16:25:26 +00:00
..
common	* clutter/cogl/gl/cogl.c:	2008-12-10 12:13:20 +00:00
gl	Merge branch multiple-texture-rectangle into master	2009-01-07 16:25:26 +00:00
gles	Use a single index array	2008-12-09 18:03:29 +00:00
cogl-color.h	2008-11-12 Emmanuele Bassi <ebassi@linux.intel.com>	2008-11-12 13:57:58 +00:00
cogl-deprecated.h	2008-11-12 Emmanuele Bassi <ebassi@linux.intel.com>	2008-11-12 13:57:58 +00:00
cogl-fixed.h	2008-10-30 Emmanuele Bassi <ebassi@linux.intel.com>	2008-10-30 17:57:41 +00:00
cogl-mesh.h	Fix warnings in mesh tests	2008-11-12 10:55:06 +00:00
cogl-offscreen.h	2008-10-30 Emmanuele Bassi <ebassi@linux.intel.com>	2008-10-30 17:57:41 +00:00
cogl-path.h	Bug 1172 - Disjoint paths and clip to path	2008-12-04 13:45:09 +00:00
cogl-shader.h	2008-11-18 Emmanuele Bassi <ebassi@linux.intel.com>	2008-11-18 15:21:02 +00:00
cogl-texture.h	Merge branch multiple-texture-rectangle into master	2009-01-07 16:25:26 +00:00
cogl-types.h	2008-11-12 Emmanuele Bassi <ebassi@linux.intel.com>	2008-11-12 13:57:58 +00:00
cogl.h.in	Bug 1172 - Disjoint paths and clip to path	2008-12-04 13:45:09 +00:00
Makefile.am	Fixed 'make dist'	2008-04-28 16:57:44 +00:00
TODO	Merged clutter-ivan branch into trunk.	2008-04-25 13:37:36 +00:00