isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-01-11 12:12:25 +00:00
Code Issues Packages Projects Releases Wiki Activity
805b88d4c0
mutter/clutter
History
Neil Roberts 805b88d4c0 Merge branch multiple-texture-rectangle into master 
Bug 1289 - Draw multiple glyphs at once

The multiple-texture-rectangle branch adds a new Cogl texture function
called cogl_texture_multiple_rectangles which is used to draw multiple
rectangles out of a texture using a single GL call. This is
significantly faster than drawing the rectangles with individual calls
on some platforms. The Pango renderer now uses this to speed up
rendering.

The conflicts are just due to the whitespace fixes in cb569a5.

Conflicts:

	clutter/cogl/gl/cogl-context.c
	clutter/cogl/gl/cogl-context.h
	clutter/cogl/gl/cogl-texture.c
2009-01-07 16:25:26 +00:00
..
cogl Merge branch multiple-texture-rectangle into master 2009-01-07 16:25:26 +00:00
eglnative 2008-10-30 Emmanuele Bassi <ebassi@linux.intel.com> 2008-10-30 17:04:34 +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 Bug 1397 - Allow localizing the command line help 2009-01-06 12:15:02 +00:00
json
osx 2008-10-30 Emmanuele Bassi <ebassi@linux.intel.com> 2008-10-30 17:04:34 +00:00
pango Use cogl_texture_multiple_rectangles in CoglPangoRenderer 2008-11-28 13:14:10 +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 Bug 1397 - Allow localizing the command line help 2009-01-06 12:15:02 +00:00
clutter-actor.c Merge the ClutterText actor 2009-01-07 12:06:33 +00:00
clutter-actor.h Add ClutterActor::create_pango_context() 2009-01-05 15:29:10 +00:00
clutter-alpha.c Fix some *_set functions so they work if the object is the same value 2009-01-05 13:19:40 +00:00
clutter-alpha.h 2008-11-18 Emmanuele Bassi <ebassi@linux.intel.com> 2008-11-18 12:42:05 +00:00
clutter-animation.c Fix some animation_set_* functions so they cope if the value is the same 2009-01-05 13:19:40 +00:00
clutter-animation.h 2008-11-17 Emmanuele Bassi <ebassi@linux.intel.com> 2008-11-18 09:50:03 +00:00
clutter-backend.c [docs] Document the newly added functions 2008-12-23 16:59:14 +00:00
clutter-backend.h Store the default font name inside ClutterBackend 2008-12-23 15:03:11 +00:00
clutter-behaviour-depth.c 2008-10-30 Emmanuele Bassi <ebassi@linux.intel.com> 2008-10-30 16:37:55 +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 Remove a double semi-colon typo 2008-12-13 11:53:03 +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
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 Convert clutter_path_get_position to take a gdouble instead of an alpha value 2008-12-16 15:39:53 +00:00
clutter-behaviour-path.h Bug 1252 - Merge ClutterBehaviourPath and ClutterBehaviourBspline 2008-12-05 13:13:37 +00:00
clutter-behaviour-rotate.c Fix an empty block 2008-12-23 20:55:35 +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 2008-10-30 Emmanuele Bassi <ebassi@linux.intel.com> 2008-10-30 16:37:55 +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 Fix some *_set functions so they work if the object is the same value 2009-01-05 13:19:40 +00:00
clutter-behaviour.h 2008-10-30 Emmanuele Bassi <ebassi@linux.intel.com> 2008-10-30 17:04:34 +00:00
clutter-bezier.c Bug 1252 - Merge ClutterBehaviourPath and ClutterBehaviourBspline 2008-12-05 13:13:37 +00:00
clutter-bezier.h Bug 1252 - Merge ClutterBehaviourPath and ClutterBehaviourBspline 2008-12-05 13:13:37 +00:00
clutter-binding-pool.c [docs] Documentation fixes 2009-01-07 14:53:54 +00:00
clutter-binding-pool.h Remove BindingPool::list_actions() 2009-01-05 16:25:50 +00:00
clutter-cairo-texture.c [docs] Documentation fixes for CairoTexture 2008-12-19 17:48:30 +00:00
clutter-cairo-texture.h [build] Replaces use of #include <cairo/cairo.h> with #include <cairo.h> 2008-12-21 21:52:50 +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 Fix some *_set functions so they work if the object is the same value 2009-01-05 13:19:40 +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 * clutter/clutter-color.c (clutter_color_new): Remove CLAMP macros 2008-11-05 12:16:15 +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 2008-11-17 Emmanuele Bassi <ebassi@linux.intel.com> 2008-11-18 09:50:03 +00:00
clutter-effect.c Bug 1252 - Merge ClutterBehaviourPath and ClutterBehaviourBspline 2008-12-05 13:13:37 +00:00
clutter-effect.h 2008-10-30 Emmanuele Bassi <ebassi@linux.intel.com> 2008-10-30 17:04:34 +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 2008-12-08 Emmanuele Bassi <ebassi@linux.intel.com> 2008-12-08 13:57:10 +00:00
clutter-feature.c
clutter-feature.h 2008-10-30 Emmanuele Bassi <ebassi@linux.intel.com> 2008-10-30 17:04:34 +00:00
clutter-fixed.c Fix a typo in the ClutterParamSpecFixed declaration 2008-12-15 14:29:59 +00:00
clutter-fixed.h Fix a typo 2008-10-31 12:07:01 +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 [clutter-interval] Fix calculation of interval for unsigned types 2008-12-17 19:26:24 +00:00
clutter-interval.h 2008-11-17 Emmanuele Bassi <ebassi@linux.intel.com> 2008-11-18 09:50:03 +00:00
clutter-json.h.in
clutter-keysyms-table.h
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 the ClutterText actor 2009-01-07 12:06:33 +00:00
clutter-main.h 2008-10-30 Emmanuele Bassi <ebassi@linux.intel.com> 2008-10-30 17:11:29 +00:00
clutter-marshal.list 2008-12-08 Emmanuele Bassi <ebassi@linux.intel.com> 2008-12-08 13:57:10 +00:00
clutter-media.c Bug 1269 - mingw32 building failed at clutter-media.c 2008-11-21 16:18:38 +00:00
clutter-media.h 2008-10-30 Emmanuele Bassi <ebassi@linux.intel.com> 2008-10-30 17:04:34 +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 Avoid masking math.h exported variables 2008-12-19 18:21:36 +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 Rename the PangoContext creation functions 2009-01-05 15:27:33 +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 Fixed some trivial compiler warnings 2008-11-18 18:53:10 +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
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 Fix off-by-one error in clutter_stage_read_pixels 2009-01-06 12:27:13 +00:00
clutter-stage.h 2008-10-30 Emmanuele Bassi <ebassi@linux.intel.com> 2008-10-30 17:04:34 +00:00
clutter-text.c [text] Do not use markup on an editable Text 2009-01-07 13:48:45 +00:00
clutter-text.h Re-align ClutterText header file 2009-01-07 11:46:22 +00:00
clutter-texture.c Merge branch 'units-rework' 2009-01-05 11:11:10 +00:00
clutter-texture.h White space clean up across a number of files (only removing trailing spaces) 2008-12-24 00:48:32 +00:00
clutter-timeline.c 2008-12-05 Emmanuele Bassi <ebassi@linux.intel.com> 2008-12-05 17:44:12 +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 2008-11-18 Emmanuele Bassi <ebassi@linux.intel.com> 2008-11-18 12:42:05 +00:00
clutter-units.c
clutter-units.h 2008-10-30 Emmanuele Bassi <ebassi@linux.intel.com> 2008-10-30 17:04:34 +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
clutter.h Merge the ClutterText actor 2009-01-07 12:06:33 +00:00
Makefile.am Merge the ClutterText actor 2009-01-07 12:06:33 +00:00