mirror of
https://github.com/brl/mutter.git
synced 2024-12-23 19:42:05 +00:00
e9a45c7744
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
|
||
|---|---|---|
| .. | ||
| Makefile.am | ||
| test-actors.c | ||
| test-animation.c | ||
| test-behave.c | ||
| test-binding-pool.c | ||
| test-clip.c | ||
| test-clutter-cairo-flowers.c | ||
| test-cogl-multitexture.c | ||
| test-cogl-offscreen.c | ||
| test-cogl-primitives.c | ||
| test-cogl-tex-convert.c | ||
| test-cogl-tex-foreign.c | ||
| test-cogl-tex-getset.c | ||
| test-cogl-tex-polygon.c | ||
| test-cogl-tex-tile.c | ||
| test-depth.c | ||
| test-devices.c | ||
| test-easing.c | ||
| test-entry.c | ||
| test-events.c | ||
| test-fbo.c | ||
| test-fullscreen.c | ||
| test-grab.c | ||
| test-layout.c | ||
| test-main.c | ||
| test-model.c | ||
| test-multistage.c | ||
| test-offscreen.c | ||
| test-paint-wrapper.c | ||
| test-perspective.c | ||
| test-pixmap.c | ||
| test-project.c | ||
| test-random-text.c | ||
| test-rotate.c | ||
| test-scale.c | ||
| test-score.c | ||
| test-script.c | ||
| test-shader.c | ||
| test-stage-read-pixels.c | ||
| test-text-field.c | ||
| test-text.c | ||
| test-texture-quality.c | ||
| test-textures.c | ||
| test-threads.c | ||
| test-unproject.c | ||
| test-viewport.c | ||
| wrapper.sh | ||