Robert Bragg 323eaf3fb3 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-bitmap-fallback.c	2008-06-30 Emmanuele Bassi <ebassi@openedhand.com>	2008-06-30 14:20:46 +00:00
cogl-bitmap-pixbuf.c	Add API for extracting image size from a file	2009-01-12 16:52:20 +00:00
cogl-bitmap.c	Add API for extracting image size from a file	2009-01-12 16:52:20 +00:00
cogl-bitmap.h	Add API for extracting image size from a file	2009-01-12 16:52:20 +00:00
cogl-clip-stack.c	[Automatic fixed-to-float.sh change] Applies all scripted changes	2009-01-20 16:20:54 +00:00
cogl-clip-stack.h	Bug 1172 - Disjoint paths and clip to path	2008-12-04 13:45:09 +00:00
cogl-color.c	[Automatic fixed-to-float.sh change] Applies a number fixed to float patches	2009-01-20 16:20:54 +00:00
cogl-fixed.c	Improve accuracy of clutter_sinx()	2009-01-22 15:59:23 +00:00
cogl-handle.h	[multi-texturing] This adds a new cogl_multi_texture API for GL,GLES1 + GLES2	2008-12-22 16:35:51 +00:00
cogl-material-private.h	Fully integrates CoglMaterial throughout the rest of Cogl	2009-01-27 14:26:39 +00:00
cogl-material.c	Updates GLES1 support for CoglMaterial	2009-01-27 14:26:50 +00:00
cogl-matrix.c	Adds CoglMatrix utility code	2008-12-22 16:35:52 +00:00
cogl-primitives.c	Merge branch 'cogl-material'	2009-01-27 15:19:34 +00:00
cogl-primitives.h	Fix the Cogl primitives for the GLES backend	2009-01-24 00:26:51 +00:00
cogl-util.c	Merged clutter-ivan branch into trunk.	2008-04-25 13:37:36 +00:00
cogl-util.h	Merged clutter-ivan branch into trunk.	2008-04-25 13:37:36 +00:00
cogl-vertex-buffer-private.h	Renames the mesh api to the "vertex buffer api".	2009-01-20 22:29:35 +00:00
cogl-vertex-buffer.c	Fully integrates CoglMaterial throughout the rest of Cogl	2009-01-27 14:26:39 +00:00
Makefile.am	Merge branch 'cogl-material'	2009-01-27 15:19:34 +00:00
stb_image.c	Merged clutter-ivan branch into trunk.	2008-04-25 13:37:36 +00:00