Merge branch multiple-texture-rectangle into master
authorNeil Roberts <neil@linux.intel.com>
Wed, 7 Jan 2009 16:10:25 +0000 (16:10 +0000)
committerNeil Roberts <neil@linux.intel.com>
Wed, 7 Jan 2009 16:25:26 +0000 (16:25 +0000)
commit805b88d4c02deda68f6adbd5f65dc6e81451b5f6
treecbf56c263a229b9baf11b0749a05728bbb8ff7a9
parent5913bcf7e3b1ac4317c33a01362c1fc6e6679704
parente21fee39b450beee1a140a3b075321687e9c6f05
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
clutter/cogl/cogl-texture.h
clutter/cogl/gl/cogl-context.c
clutter/cogl/gl/cogl-context.h
clutter/cogl/gl/cogl-texture.c