isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-09-20 06:25:51 -04:00
Code Issues Packages Projects Releases Wiki Activity
Read-only mirror of https://gitlab.gnome.org/GNOME/mutter
226 Commits 187 Branches 380 Tags 96 MiB
C 98.9%
Meson 0.7%
Python 0.3%
323eaf3fb3
Go to file
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
common Merge branch 'cogl-material' 2009-01-27 15:19:34 +00:00
doc/reference/cogl Merge commit 'origin/master' into cogl-material 2009-01-23 15:23:49 +00:00
gl Merge branch 'cogl-material' 2009-01-27 15:19:34 +00:00
gles Merge branch 'cogl-material' 2009-01-27 15:19:34 +00:00
cogl-color.h [Automatic fixed-to-float.sh change] Applies a number fixed to float patches 2009-01-20 16:20:54 +00:00
cogl-deprecated.h 2008-11-12 Emmanuele Bassi <ebassi@linux.intel.com> 2008-11-12 13:57:58 +00:00
cogl-fixed.h [Automatic fixed-to-float.sh change] Applies a number fixed to float patches 2009-01-20 16:20:54 +00:00
cogl-material.h Fully integrates CoglMaterial throughout the rest of Cogl 2009-01-27 14:26:39 +00:00
cogl-matrix.h [doc] Hooks up cogl-matrix reference documentation 2008-12-22 16:35:52 +00:00
cogl-offscreen.h 2008-10-30 Emmanuele Bassi <ebassi@linux.intel.com> 2008-10-30 17:57:41 +00:00
cogl-path.h Fully integrates CoglMaterial throughout the rest of Cogl 2009-01-27 14:26:39 +00:00
cogl-shader.h 2008-11-18 Emmanuele Bassi <ebassi@linux.intel.com> 2008-11-18 15:21:02 +00:00
cogl-texture.h Fully integrates CoglMaterial throughout the rest of Cogl 2009-01-27 14:26:39 +00:00
cogl-types.h Change the COGL texture constructor to use flags 2009-01-21 10:14:29 +00:00
cogl-vertex-buffer.h [docs] Remove sources of warnings in API references 2009-01-21 16:41:18 +00:00
cogl.h.in Removes cogl_blend_func and cogl_alpha_func 2009-01-27 14:26:49 +00:00
Makefile.am Fixed 'make dist' 2008-04-28 16:57:44 +00:00
TODO Merged clutter-ivan branch into trunk. 2008-04-25 13:37:36 +00:00