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
..
ADDING_NEW_TESTS	* tests/conform/ADDING_NEW_TESTS	2008-11-10 18:52:50 +00:00
Makefile.am	Clean up the test reports	2009-01-23 13:29:55 +00:00
test-actor-invariants.c
test-backface-culling.c	Fully integrates CoglMaterial throughout the rest of Cogl	2009-01-27 14:26:39 +00:00
test-binding-pool.c	Remove a masking with index()	2008-12-23 21:06:05 +00:00
test-clutter-fixed.c
test-clutter-rectangle.c
test-clutter-text.c	[tests] Add unit for the ClutterText:password-char property	2009-01-06 15:30:31 +00:00
test-conform-common.c	* tests/conform/ADDING_NEW_TESTS	2008-11-10 18:52:50 +00:00
test-conform-common.h
test-conform-main.c	Renames the mesh api to the "vertex buffer api".	2009-01-20 22:29:35 +00:00
test-launcher.sh	[tests] Ensure that test-launcher.sh is found for out of tree builds	2008-12-21 14:07:22 +00:00
test-paint-opacity.c	Update the paint opacity unit test	2008-12-11 12:26:47 +00:00
test-path.c	Merge branch 'cairo-texture'	2008-12-19 16:44:40 +00:00
test-pick.c	* tests/conform/test-pick.c (test_pick): The final result message	2008-11-18 12:36:27 +00:00
test-text-cache.c	[tests] Make the layout cache fail at the right place	2008-12-16 13:58:54 +00:00
test-timeline-dup-frames.c
test-timeline-interpolate.c
test-timeline-rewind.c
test-timeline-smoothness.c
test-timeline.c	[tests] Remove an unused variable	2009-01-27 13:22:47 +00:00
test-vertex-buffer-contiguous.c	Renames the mesh api to the "vertex buffer api".	2009-01-20 22:29:35 +00:00
test-vertex-buffer-interleved.c	Renames the mesh api to the "vertex buffer api".	2009-01-20 22:29:35 +00:00
test-vertex-buffer-mutability.c	Renames the mesh api to the "vertex buffer api".	2009-01-20 22:29:35 +00:00