mutter/clutter/cogl/gles
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-context.c Updates GLES1 support for CoglMaterial 2009-01-27 14:26:50 +00:00
cogl-context.h Updates GLES1 support for CoglMaterial 2009-01-27 14:26:50 +00:00
cogl-defines.h.in [multi-texturing] This adds a new cogl_multi_texture API for GL,GLES1 + GLES2 2008-12-22 16:35:51 +00:00
cogl-fbo.c Normalizes gl vs gles code in preperation for synching material changes 2009-01-27 14:26:50 +00:00
cogl-fbo.h Bug 1074 - FBOs on GLES 2008-10-29 14:52:48 +00:00
cogl-fixed-fragment-shader.glsl [multi-texturing] This adds a new cogl_multi_texture API for GL,GLES1 + GLES2 2008-12-22 16:35:51 +00:00
cogl-fixed-vertex-shader.glsl [multi-texturing] This adds a new cogl_multi_texture API for GL,GLES1 + GLES2 2008-12-22 16:35:51 +00:00
cogl-gles2-wrapper.c Merge commit 'origin/master' into cogl-material 2009-01-23 15:23:49 +00:00
cogl-gles2-wrapper.h Updates GLES1 support for CoglMaterial 2009-01-27 14:26:50 +00:00
cogl-internal.h Updates GLES1 support for CoglMaterial 2009-01-27 14:26:50 +00:00
cogl-primitives.c Merge branch 'cogl-material' 2009-01-27 15:19:34 +00:00
cogl-program.c 2008-11-18 Emmanuele Bassi <ebassi@linux.intel.com> 2008-11-18 15:21:02 +00:00
cogl-program.h * clutter/cogl/gles/cogl-gles2-wrapper.h: 2008-06-24 16:21:40 +00:00
cogl-shader-private.h 2008-10-30 Emmanuele Bassi <ebassi@linux.intel.com> 2008-10-30 17:25:00 +00:00
cogl-shader.c 2008-10-30 Emmanuele Bassi <ebassi@linux.intel.com> 2008-10-30 17:25:00 +00:00
cogl-texture-private.h Updates GLES1 support for CoglMaterial 2009-01-27 14:26:50 +00:00
cogl-texture.c Updates GLES1 support for CoglMaterial 2009-01-27 14:26:50 +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.c Updates GLES1 support for CoglMaterial 2009-01-27 14:26:50 +00:00
Makefile.am Merge branch 'cogl-material' 2009-01-27 15:19:34 +00:00
stringify.sh * clutter/cogl/gles/cogl-gles2-wrapper.h: 2008-06-24 16:21:40 +00:00