isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-10 16:16:20 -05:00
Code Issues Packages Projects Releases Wiki Activity
e9a45c7744
mutter/clutter
History
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 Merge branch 'cogl-material' 2009-01-27 15:19:34 +00:00
eglnative [eglnative] Set the SYNC_MATRICES on stage realization 2009-01-16 22:13:44 +00:00
eglx 2008-10-30 Emmanuele Bassi <ebassi@linux.intel.com> 2008-10-30 17:04:34 +00:00
fruity 2008-10-30 Emmanuele Bassi <ebassi@linux.intel.com> 2008-10-30 17:04:34 +00:00
glx Fix compile warning for a possible uninitialized variable 2009-01-14 15:04:28 +00:00
json
osx 2008-10-30 Emmanuele Bassi <ebassi@linux.intel.com> 2008-10-30 17:04:34 +00:00
pango Merge branch 'cogl-material' 2009-01-27 15:19:34 +00:00
sdl 2008-10-30 Emmanuele Bassi <ebassi@linux.intel.com> 2008-10-30 17:04:34 +00:00
win32 2008-10-30 Emmanuele Bassi <ebassi@linux.intel.com> 2008-10-30 17:04:34 +00:00
x11 Fix properties that have X11 types to be 'long' 2009-01-16 23:44:32 +00:00
clutter-actor.c Bug 1415 - short-circuit setting same clip again 2009-01-26 16:22:39 +00:00
clutter-actor.h Bug 1380 - Return booleans from CLUTTER_ACTOR_IS_* macros 2009-01-14 18:18:20 +00:00
clutter-alpha.c Merge branch 'cogl-float' 2009-01-20 18:47:50 +00:00
clutter-alpha.h Merge branch 'cogl-float' 2009-01-20 18:47:50 +00:00
clutter-animatable.c Add license notice to ClutterAnimation files 2009-01-08 13:18:00 +00:00
clutter-animatable.h Add license notice to ClutterAnimation files 2009-01-08 13:18:00 +00:00
clutter-animation.c [animation] Move the alpha value to floating point 2009-01-20 16:42:49 +00:00
clutter-animation.h Remove AnimationMode from the Animation API 2009-01-16 14:37:42 +00:00
clutter-backend.c Store the units-per-em inside the Backend 2009-01-22 11:42:11 +00:00
clutter-backend.h Store the default font name inside ClutterBackend 2008-12-23 15:03:11 +00:00
clutter-behaviour-depth.c Fix compiler warnings 2009-01-23 13:08:46 +00:00
clutter-behaviour-depth.h 2008-10-30 Emmanuele Bassi <ebassi@linux.intel.com> 2008-10-30 17:04:34 +00:00
clutter-behaviour-ellipse.c Whitespace fixes for BehaviourEllipse 2009-01-24 14:32:10 +00:00
clutter-behaviour-ellipse.h 2008-10-30 Emmanuele Bassi <ebassi@linux.intel.com> 2008-10-30 17:04:34 +00:00
clutter-behaviour-opacity.c [animation] Move the alpha value to floating point 2009-01-20 16:42:49 +00:00
clutter-behaviour-opacity.h 2008-10-30 Emmanuele Bassi <ebassi@linux.intel.com> 2008-10-30 17:04:34 +00:00
clutter-behaviour-path.c [animation] Move the alpha value to floating point 2009-01-20 16:42:49 +00:00
clutter-behaviour-path.h Bug 1252 - Merge ClutterBehaviourPath and ClutterBehaviourBspline 2008-12-05 13:13:37 +00:00
clutter-behaviour-rotate.c Merge branch 'float-alpha-value' 2009-01-23 12:10:50 +00:00
clutter-behaviour-rotate.h 2008-10-30 Emmanuele Bassi <ebassi@linux.intel.com> 2008-10-30 17:04:34 +00:00
clutter-behaviour-scale.c Merge branch 'float-alpha-value' 2009-01-23 12:10:50 +00:00
clutter-behaviour-scale.h 2008-10-30 Emmanuele Bassi <ebassi@linux.intel.com> 2008-10-30 17:04:34 +00:00
clutter-behaviour.c Bug 1395 - apply and get_nth_actor are inconsistent 2009-01-24 14:32:09 +00:00
clutter-behaviour.h [animation] Move the alpha value to floating point 2009-01-20 16:42:49 +00:00
clutter-bezier.c [Automatic fixed-to-float.sh change] Applies a number fixed to float patches 2009-01-20 16:20:54 +00:00
clutter-bezier.h Bug 1252 - Merge ClutterBehaviourPath and ClutterBehaviourBspline 2008-12-05 13:13:37 +00:00
clutter-binding-pool.c Add ClutterBindingPool:name 2009-01-13 12:51:03 +00:00
clutter-binding-pool.h Add declaration of clutter_binding_pool_get_type() 2009-01-14 15:03:30 +00:00
clutter-cairo-texture.c [docs] Documentation fixes for CairoTexture 2008-12-19 17:48:30 +00:00
clutter-cairo-texture.h [docs] Documentation warnings 2009-01-09 14:26:35 +00:00
clutter-child-meta.c 2008-08-06 Emmanuele Bassi <ebassi@openedhand.com> 2008-08-06 10:20:57 +00:00
clutter-child-meta.h 2008-10-30 Emmanuele Bassi <ebassi@linux.intel.com> 2008-10-30 17:04:34 +00:00
clutter-clone-texture.c clutter-{clone-,}texture weren't updating their material opacity. 2009-01-27 14:26:50 +00:00
clutter-clone-texture.h 2008-10-30 Emmanuele Bassi <ebassi@linux.intel.com> 2008-10-30 17:04:34 +00:00
clutter-color.c [Automatic fixed-to-float.sh change] Applies all scripted changes 2009-01-20 16:20:54 +00:00
clutter-color.h 2008-10-30 Emmanuele Bassi <ebassi@linux.intel.com> 2008-10-30 17:04:34 +00:00
clutter-container.c 2008-10-16 Emmanuele Bassi <ebassi@linux.intel.com> 2008-10-16 10:28:17 +00:00
clutter-container.h 2008-10-30 Emmanuele Bassi <ebassi@linux.intel.com> 2008-10-30 17:04:34 +00:00
clutter-debug.h 2008-11-17 Emmanuele Bassi <ebassi@linux.intel.com> 2008-11-18 09:50:03 +00:00
clutter-deprecated.h Replace clutter_set_use_mipmapped_text with clutter_set_font_flags 2009-01-27 14:43:44 +00:00
clutter-enum-types.c.in
clutter-enum-types.h.in
clutter-event.c 2008-12-08 Emmanuele Bassi <ebassi@linux.intel.com> 2008-12-08 13:57:10 +00:00
clutter-event.h [docs] Specify the coordinate space of ButtonEvent 2009-01-21 22:03:31 +00:00
clutter-feature.c 2008-06-06 Matthew Allum <mallum@openedhand.com> 2008-06-06 13:44:22 +00:00
clutter-feature.h 2008-10-30 Emmanuele Bassi <ebassi@linux.intel.com> 2008-10-30 17:04:34 +00:00
clutter-fixed.c [Automatic fixed-to-float.sh change] Applies a number fixed to float patches 2009-01-20 16:20:54 +00:00
clutter-fixed.h [Automatic fixed-to-float.sh change] Hand coded changes for clutter-{fixed,units} 2009-01-20 16:20:55 +00:00
clutter-frame-source.c
clutter-frame-source.h 2008-10-30 Emmanuele Bassi <ebassi@linux.intel.com> 2008-10-30 17:04:34 +00:00
clutter-group.c 2008-11-26 Emmanuele Bassi <ebassi@linux.intel.com> 2008-11-26 16:46:48 +00:00
clutter-group.h 2008-10-30 Emmanuele Bassi <ebassi@linux.intel.com> 2008-10-30 17:04:34 +00:00
clutter-id-pool.c
clutter-id-pool.h 2008-10-30 Emmanuele Bassi <ebassi@linux.intel.com> 2008-10-30 17:04:34 +00:00
clutter-interval.c Merge branch 'float-alpha-value' 2009-01-23 12:10:50 +00:00
clutter-interval.h [animation] Allow registering custom progress function 2009-01-08 11:15:09 +00:00
clutter-json.h.in
clutter-keysyms-table.h 7 small miscellaneous fixes 2008-06-10 06:37:46 +00:00
clutter-keysyms.h 2008-08-04 Emmanuele Bassi <ebassi@openedhand.com> 2008-08-05 10:54:40 +00:00
clutter-list-model.c
clutter-list-model.h 2008-10-30 Emmanuele Bassi <ebassi@linux.intel.com> 2008-10-30 17:04:34 +00:00
clutter-main.c Merge branch 'cogl-material' 2009-01-27 15:19:34 +00:00
clutter-main.h Replace clutter_set_use_mipmapped_text with clutter_set_font_flags 2009-01-27 14:43:44 +00:00
clutter-marshal.list [animation] Move the alpha value to floating point 2009-01-20 16:42:49 +00:00
clutter-media.c Bug 1404 - ClutterMedia issues 2009-01-20 23:40:25 +00:00
clutter-media.h Bug 1404 - ClutterMedia issues 2009-01-20 23:40:25 +00:00
clutter-model-private.h
clutter-model.c * clutter/clutter-model.c (clutter_model_set_sorting_column): This 2008-07-30 10:32:25 +00:00
clutter-model.h 2008-10-30 Emmanuele Bassi <ebassi@linux.intel.com> 2008-10-30 17:04:34 +00:00
clutter-path.c [Automatic fixed-to-float.sh change] Applies a number fixed to float patches 2009-01-20 16:20:54 +00:00
clutter-path.h [build] Replaces use of #include <cairo/cairo.h> with #include <cairo.h> 2008-12-21 21:52:50 +00:00
clutter-private.h Replace clutter_set_use_mipmapped_text with clutter_set_font_flags 2009-01-27 14:43:44 +00:00
clutter-rectangle.c 2008-11-17 Emmanuele Bassi <ebassi@linux.intel.com> 2008-11-17 14:21:49 +00:00
clutter-rectangle.h 2008-10-30 Emmanuele Bassi <ebassi@linux.intel.com> 2008-10-30 17:04:34 +00:00
clutter-score.c Bug 1299 - clutter_score_remove will segmentation fault if 2008-11-25 13:19:48 +00:00
clutter-score.h 2008-10-30 Emmanuele Bassi <ebassi@linux.intel.com> 2008-10-30 17:04:34 +00:00
clutter-script-parser.c 2008-08-04 Emmanuele Bassi <ebassi@openedhand.com> 2008-08-04 16:21:27 +00:00
clutter-script-private.h 2008-08-04 Emmanuele Bassi <ebassi@openedhand.com> 2008-08-04 16:21:27 +00:00
clutter-script.c [script] Parse easing modes by name 2009-01-20 18:24:58 +00:00
clutter-script.h 2008-10-30 Emmanuele Bassi <ebassi@linux.intel.com> 2008-10-30 17:04:34 +00:00
clutter-scriptable.c
clutter-scriptable.h 2008-10-30 Emmanuele Bassi <ebassi@linux.intel.com> 2008-10-30 17:04:34 +00:00
clutter-shader-types.c 2008-11-18 Emmanuele Bassi <ebassi@linux.intel.com> 2008-11-18 15:08:40 +00:00
clutter-shader-types.h 2008-11-18 Emmanuele Bassi <ebassi@linux.intel.com> 2008-11-18 15:08:40 +00:00
clutter-shader.c 2008-11-18 Emmanuele Bassi <ebassi@linux.intel.com> 2008-11-18 15:08:40 +00:00
clutter-shader.h 2008-11-18 Emmanuele Bassi <ebassi@linux.intel.com> 2008-11-18 15:08:40 +00:00
clutter-stage-manager.c Applied patch from bug #947 2008-06-03 20:15:11 +00:00
clutter-stage-manager.h 2008-10-30 Emmanuele Bassi <ebassi@linux.intel.com> 2008-10-30 17:04:34 +00:00
clutter-stage-window.c
clutter-stage-window.h 2008-10-30 Emmanuele Bassi <ebassi@linux.intel.com> 2008-10-30 17:04:34 +00:00
clutter-stage.c Set the SYNC_MATRICES flag when a stage is first realized 2009-01-26 10:58:40 +00:00
clutter-stage.h Bug 1361 - Unused ClutterStage::get_resolution() methods 2009-01-23 15:16:21 +00:00
clutter-text.c [clutter-text] Fix x-position of cursor when moving up or down 2009-01-14 11:12:02 +00:00
clutter-text.h Re-align ClutterText header file 2009-01-07 11:46:22 +00:00
clutter-texture.c Merge branch 'cogl-material' 2009-01-27 15:19:34 +00:00
clutter-texture.h Merge commit 'origin/master' into cogl-material 2009-01-23 15:23:49 +00:00
clutter-timeline.c Bug 1388 - Clarify signal emission for advance_to_marker() 2009-01-27 11:25:06 +00:00
clutter-timeline.h 2008-10-30 Emmanuele Bassi <ebassi@linux.intel.com> 2008-10-30 17:04:34 +00:00
clutter-timeout-pool.c 2008-09-23 Emmanuele Bassi <ebassi@linux.intel.com> 2008-09-23 13:25:31 +00:00
clutter-timeout-pool.h 2008-10-30 Emmanuele Bassi <ebassi@linux.intel.com> 2008-10-30 17:04:34 +00:00
clutter-types.h Replace clutter_set_use_mipmapped_text with clutter_set_font_flags 2009-01-27 14:43:44 +00:00
clutter-units.c [units] Fix Units in GValue and ClutterParamSpecUnit 2009-01-22 12:11:25 +00:00
clutter-units.h Add units-from-em conversion 2009-01-21 17:35:47 +00:00
clutter-util.c
clutter-util.h 2008-10-30 Emmanuele Bassi <ebassi@linux.intel.com> 2008-10-30 17:04:34 +00:00
clutter-version.h.in 2008-03-31 Matthew Allum <mallum@openedhand.com> 2008-03-31 17:15:02 +00:00
clutter.h Remove the Effects API 2009-01-14 16:56:21 +00:00
Makefile.am Split maintainer-flags from the compiler flags 2009-01-23 13:09:51 +00:00