Robert Bragg e9a45c7744 Merge branch 'cogl-material' ... Conflicts: clutter/cogl/gl/cogl-texture.c clutter/cogl/gles/cogl-primitives.c * cogl-material: clutter-{clone-,}texture weren't updating their material opacity. Updates GLES1 support for CoglMaterial Normalizes gl vs gles code in preperation for synching material changes Removes cogl_blend_func and cogl_alpha_func Fully integrates CoglMaterial throughout the rest of Cogl [cogl-material] Restore the GL_TEXTURE_ENV_MODE after material_rectangle [cogl-material] Make the user_tex_coords parameter of _rectangle const [test-cogl-material] Remove return value from material_rectangle_paint Add cogl-material.h and cogl-matrix.h to libclutterinclude_HEADERS [cogl-material] improvements for cogl_material_rectangle [cogl-material] Adds a cogl_material_set_color function [cogl-material] Some improvements for how we sync CoglMaterial state with OpenGL [cogl-material] Converts clutter-texture/clutter-clone-texture to the material API [doc] Hooks up cogl-material reference documentation Updates previous GLES multi-texturing code to use CoglMaterial Adds a CoglMaterial abstraction, which includes support for multi-texturing [doc] Hooks up cogl-matrix reference documentation Adds CoglMatrix utility code [tests] Adds an interactive unit test for multi-texturing [multi-texturing] This adds a new cogl_multi_texture API for GL,GLES1 + GLES2		2009-01-27 15:19:34 +00:00
..
cogl-pango-fontmap.c	2008-10-31 Emmanuele Bassi <ebassi@linux.intel.com>	2008-10-31 17:48:24 +00:00
cogl-pango-glyph-cache.c	Change the COGL texture constructor to use flags	2009-01-21 10:14:29 +00:00
cogl-pango-glyph-cache.h	[Automatic fixed-to-float.sh change] Applies all scripted changes	2009-01-20 16:20:54 +00:00
cogl-pango-private.h	2008-10-30 Emmanuele Bassi <ebassi@linux.intel.com>	2008-10-30 17:11:29 +00:00
cogl-pango-render.c	Fully integrates CoglMaterial throughout the rest of Cogl	2009-01-27 14:26:39 +00:00
cogl-pango.h	* clutter/pango/cogl-pango.h: Include pango/pango.h to get	2008-11-21 16:18:31 +00:00
Makefile.am	Split maintainer-flags from the compiler flags	2009-01-23 13:09:51 +00:00