brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove calls to cogl_disable_fog

Browse Source 
I can't think of any reason why it would do this and there's no
comment explaining it so let's just remove it. The global fog state
has been removed in Cogl 2.0 so it will cause problems later.

Reviewed-by: Emmanuele Bassi <ebassi@linux.intel.com>
This commit is contained in:
Neil Roberts 2012-04-20 18:40:31 +01:00
parent 107f43a838
commit f7f8179898
2 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
clutter/clutter-stage.c
View File

@ -696,8 +696,6 @@ clutter_stage_paint (ClutterActor *self)
if (!STAGE_NO_CLEAR_ON_PAINT (self)) if (!STAGE_NO_CLEAR_ON_PAINT (self))
clear_flags |= COGL_BUFFER_BIT_COLOR; clear_flags |= COGL_BUFFER_BIT_COLOR;
cogl_disable_fog ();
CLUTTER_TIMER_START (_clutter_uprof_context, stage_clear_timer); CLUTTER_TIMER_START (_clutter_uprof_context, stage_clear_timer);
/* we use the real alpha to clear the stage if :use-alpha is /* we use the real alpha to clear the stage if :use-alpha is
* set; the effect depends entirely on the Clutter backend * set; the effect depends entirely on the Clutter backend
@ -1500,7 +1498,6 @@ _clutter_stage_do_pick (ClutterStage *stage,
CLUTTER_NOTE (PICK, "Performing %s pick at %i,%i", CLUTTER_NOTE (PICK, "Performing %s pick at %i,%i",
is_clipped ? "clippped" : "full", x, y); is_clipped ? "clippped" : "full", x, y);
cogl_disable_fog ();
cogl_color_init_from_4ub (&stage_pick_id, 255, 255, 255, 255); cogl_color_init_from_4ub (&stage_pick_id, 255, 255, 255, 255);
CLUTTER_TIMER_START (_clutter_uprof_context, pick_clear); CLUTTER_TIMER_START (_clutter_uprof_context, pick_clear);
cogl_clear (&stage_pick_id, cogl_clear (&stage_pick_id,

1
clutter/clutter-texture.c
View File

@ -556,7 +556,6 @@ update_fbo (ClutterActor *self)
cogl_clear (&transparent_col, cogl_clear (&transparent_col,
COGL_BUFFER_BIT_COLOR | COGL_BUFFER_BIT_COLOR |
COGL_BUFFER_BIT_DEPTH); COGL_BUFFER_BIT_DEPTH);
cogl_disable_fog ();
/* Render the actor to the fbo */ /* Render the actor to the fbo */
clutter_actor_paint (priv->fbo_source); clutter_actor_paint (priv->fbo_source);