mirror of
https://github.com/brl/mutter.git
synced 2024-09-20 06:25:51 -04:00
323eaf3fb3
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
|
||
|---|---|---|
| .. | ||
| cogl-context.c | ||
| cogl-context.h | ||
| cogl-defines.h.in | ||
| cogl-fbo.c | ||
| cogl-fbo.h | ||
| cogl-fixed-fragment-shader.glsl | ||
| cogl-fixed-vertex-shader.glsl | ||
| cogl-gles2-wrapper.c | ||
| cogl-gles2-wrapper.h | ||
| cogl-internal.h | ||
| cogl-primitives.c | ||
| cogl-program.c | ||
| cogl-program.h | ||
| cogl-shader-private.h | ||
| cogl-shader.c | ||
| cogl-texture-private.h | ||
| cogl-texture.c | ||
| cogl-util.c | ||
| cogl-util.h | ||
| cogl.c | ||
| Makefile.am | ||
| stringify.sh | ||