summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCedric BAIL <cedric@osg.samsung.com>2017-08-25 10:52:42 -0700
committerCedric BAIL <cedric@osg.samsung.com>2017-08-25 10:52:42 -0700
commitf354463dc1524da7e2475f3aab893959fcdc4e54 (patch)
tree3944928eb16107f334a8d2bf01b6a8adab7a6dd0
parent79ed7a0cc2f9a8bb4bb36b22d5c6e909c2d63491 (diff)
evas: propagate output in evas_render_updates_internal_loop instead of using ENDT.
-rw-r--r--src/lib/evas/canvas/evas_render.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/lib/evas/canvas/evas_render.c b/src/lib/evas/canvas/evas_render.c
index 8ef8bc1cda..17e4a1b368 100644
--- a/src/lib/evas/canvas/evas_render.c
+++ b/src/lib/evas/canvas/evas_render.c
@@ -2902,7 +2902,7 @@ evas_render_pre(Evas *eo_e, Evas_Public_Data *evas)
2902 2902
2903static Eina_Bool 2903static Eina_Bool
2904evas_render_updates_internal_loop(Evas *eo_e, Evas_Public_Data *evas, 2904evas_render_updates_internal_loop(Evas *eo_e, Evas_Public_Data *evas,
2905 void *surface, void *context, 2905 void *output, void *surface, void *context,
2906 Evas_Object_Protected_Data *top, 2906 Evas_Object_Protected_Data *top,
2907 int ux, int uy, int uw, int uh, 2907 int ux, int uy, int uw, int uh,
2908 int cx, int cy, int cw, int ch, 2908 int cx, int cy, int cw, int ch,
@@ -2951,7 +2951,7 @@ evas_render_updates_internal_loop(Evas *eo_e, Evas_Public_Data *evas,
2951 ENFN->context_color_set(ENC, context, 0, 0, 0, 0); 2951 ENFN->context_color_set(ENC, context, 0, 0, 0, 0);
2952 ENFN->context_multiplier_unset(ENC, context); 2952 ENFN->context_multiplier_unset(ENC, context);
2953 ENFN->context_render_op_set(ENC, context, EVAS_RENDER_COPY); 2953 ENFN->context_render_op_set(ENC, context, EVAS_RENDER_COPY);
2954 ENFN->rectangle_draw(ENC, ENDT, context, surface, cx, cy, cw, ch, do_async); 2954 ENFN->rectangle_draw(ENC, output, context, surface, cx, cy, cw, ch, do_async);
2955 ENFN->context_cutout_clear(ENC, context); 2955 ENFN->context_cutout_clear(ENC, context);
2956 ENFN->context_clip_unset(ENC, context); 2956 ENFN->context_clip_unset(ENC, context);
2957 } 2957 }
@@ -3021,7 +3021,7 @@ evas_render_updates_internal_loop(Evas *eo_e, Evas_Public_Data *evas,
3021 Evas_Object_Protected_Data *prev_mask = obj->clip.prev_mask; 3021 Evas_Object_Protected_Data *prev_mask = obj->clip.prev_mask;
3022 3022
3023 if (mask->mask->redraw || !mask->mask->surface) 3023 if (mask->mask->redraw || !mask->mask->surface)
3024 evas_render_mask_subrender(obj->layer->evas, ENDT, mask, prev_mask, 4, do_async); 3024 evas_render_mask_subrender(obj->layer->evas, output, mask, prev_mask, 4, do_async);
3025 3025
3026 if (mask->mask->surface) 3026 if (mask->mask->surface)
3027 { 3027 {
@@ -3073,7 +3073,7 @@ evas_render_updates_internal_loop(Evas *eo_e, Evas_Public_Data *evas,
3073 obj->cur->cache.clip.h); 3073 obj->cur->cache.clip.h);
3074 eina_evlog("-cutouts_add", obj->object, 0.0, NULL); 3074 eina_evlog("-cutouts_add", obj->object, 0.0, NULL);
3075 clean_them |= evas_render_mapped(evas, eo_obj, obj, context, 3075 clean_them |= evas_render_mapped(evas, eo_obj, obj, context,
3076 ENDT, surface, 3076 output, surface,
3077 off_x + fx, off_y + fy, 0, 3077 off_x + fx, off_y + fy, 0,
3078 cx, cy, cw, ch, 3078 cx, cy, cw, ch,
3079 NULL, level + 3, do_async); 3079 NULL, level + 3, do_async);
@@ -3458,7 +3458,7 @@ evas_render_updates_internal(Evas *eo_e,
3458 3458
3459 RD(0, " SNAPSHOT %s [sfc:%p ur:%d,%d %dx%d]\n", RDNAME(snap), pseudo_canvas, ur.x, ur.y, ur.w, ur.h); 3459 RD(0, " SNAPSHOT %s [sfc:%p ur:%d,%d %dx%d]\n", RDNAME(snap), pseudo_canvas, ur.x, ur.y, ur.w, ur.h);
3460 ctx = ENFN->context_new(ENC); 3460 ctx = ENFN->context_new(ENC);
3461 clean_them |= evas_render_updates_internal_loop(eo_e, e, pseudo_canvas, ctx, 3461 clean_them |= evas_render_updates_internal_loop(eo_e, e, ENDT, pseudo_canvas, ctx,
3462 snap, 3462 snap,
3463 ur.x, ur.y, ur.w, ur.h, 3463 ur.x, ur.y, ur.w, ur.h,
3464 cr.x, cr.y, cr.w, cr.h, 3464 cr.x, cr.y, cr.w, cr.h,
@@ -3486,7 +3486,7 @@ evas_render_updates_internal(Evas *eo_e,
3486 } 3486 }
3487 3487
3488 ctx = ENFN->context_new(ENC); 3488 ctx = ENFN->context_new(ENC);
3489 clean_them |= evas_render_updates_internal_loop(eo_e, e, surface, 3489 clean_them |= evas_render_updates_internal_loop(eo_e, e, ENDT, surface,
3490 ctx, NULL, 3490 ctx, NULL,
3491 ux, uy, uw, uh, 3491 ux, uy, uw, uh,
3492 cx, cy, cw, ch, 3492 cx, cy, cw, ch,