isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-12-25 04:22:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "[actor] Avoid modifying materials mid-scene to improve journal batching"

Browse Source 
This reverts commit 85243da382025bd516937c76a61b8381f6e74689.

Since the journal puts material colors in the vertex array accumulated for
drawing we don't need to flush the journal simply due to color changes
which means using cogl_set_source_color4ub is no longer a concern.
This commit is contained in:
Robert Bragg 2009-06-24 18:20:45 +01:00
parent 8b67916cc1
commit 5ffbe05248
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
clutter/clutter-actor.c
View File

@ -332,8 +332,6 @@ struct _ClutterActorPrivate
PangoContext *pango_context; PangoContext *pango_context;
ClutterActor *opacity_parent; ClutterActor *opacity_parent;
CoglHandle pick_material;
}; };
enum enum
@ -1376,13 +1374,11 @@ clutter_actor_real_pick (ClutterActor *self,
width = box.x2 - box.x1; width = box.x2 - box.x1;
height = box.y2 - box.y1; height = box.y2 - box.y1;
cogl_material_set_color4ub (self->priv->pick_material, cogl_set_source_color4ub (color->red,
color->red, color->green,
color->green, color->blue,
color->blue, color->alpha);
color->alpha);
cogl_set_source (self->priv->pick_material);
cogl_rectangle (0, 0, width, height); cogl_rectangle (0, 0, width, height);
} }
} }
@ -4258,8 +4254,6 @@ clutter_actor_init (ClutterActor *self)
priv->opacity_parent = NULL; priv->opacity_parent = NULL;
priv->enable_model_view_transform = TRUE; priv->enable_model_view_transform = TRUE;
priv->pick_material = cogl_material_new ();
memset (priv->clip, 0, sizeof (gfloat) * 4); memset (priv->clip, 0, sizeof (gfloat) * 4);
} }