NorwayFun
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

evas: improve textblock rendering by walking even less in all case. 

We now build a list of item to walk on for each step to just avoid all necessary walking.
It is a slightly more elegant idea than my previous patch even if it only give a speed
improvement of 5% in the best case. Now that render code and the callee only take 1.6%
of the time I am looking at in the benchmark, meaning nothing else to improve here.

This fix the bug spotted in Enlightenment dialog box.
This commit is contained in:
Cedric BAIL 2013-12-27 09:34:29 +09:00
parent 3367bf0aba
commit 922fe6c109
1 changed files with 233 additions and 207 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

112
src/lib/evas/canvas/evas_object_textblock.c
View File

@ -373,14 +373,17 @@ typedef enum _Evas_Textblock_Item_Type
struct _Evas_Object_Textblock_Item struct _Evas_Object_Textblock_Item
{ {
EINA_INLIST; EINA_INLIST;
Evas_Textblock_Item_Type type;
Evas_Object_Textblock_Node_Text *text_node; Evas_Object_Textblock_Node_Text *text_node;
Evas_Object_Textblock_Format *format; Evas_Object_Textblock_Format *format;
Evas_Object_Textblock_Line *ln;
size_t text_pos; size_t text_pos;
#ifdef BIDI_SUPPORT #ifdef BIDI_SUPPORT
size_t visual_pos; size_t visual_pos;
#endif #endif
Evas_Textblock_Item_Type type;
Evas_Coord adv, x, w, h; Evas_Coord adv, x, w, h;
Evas_Coord yoff;
Eina_Bool merge : 1; /* Indicates whether this Eina_Bool merge : 1; /* Indicates whether this
item should merge to the item should merge to the
previous item or not */ previous item or not */
@ -4439,6 +4442,7 @@ _layout_handle_ellipsis(Ctxt *c, Evas_Object_Textblock_Item *it, Eina_List *i)
c->ln->items = (Evas_Object_Textblock_Item *) c->ln->items = (Evas_Object_Textblock_Item *)
eina_inlist_append(EINA_INLIST_GET(c->ln->items), eina_inlist_append(EINA_INLIST_GET(c->ln->items),
EINA_INLIST_GET(it)); EINA_INLIST_GET(it));
it->ln = c->ln;
if (it->type == EVAS_TEXTBLOCK_ITEM_FORMAT) if (it->type == EVAS_TEXTBLOCK_ITEM_FORMAT)
{ {
Evas_Object_Textblock_Format_Item *fi; Evas_Object_Textblock_Format_Item *fi;
@ -4449,6 +4453,7 @@ _layout_handle_ellipsis(Ctxt *c, Evas_Object_Textblock_Item *it, Eina_List *i)
c->ln->items = (Evas_Object_Textblock_Item *) c->ln->items = (Evas_Object_Textblock_Item *)
eina_inlist_append(EINA_INLIST_GET(c->ln->items), eina_inlist_append(EINA_INLIST_GET(c->ln->items),
EINA_INLIST_GET(_ITEM(ellip_ti))); EINA_INLIST_GET(_ITEM(ellip_ti)));
_ITEM(ellip_ti)->ln = c->ln;
c->position = (c->position == TEXTBLOCK_POSITION_START) ? c->position = (c->position == TEXTBLOCK_POSITION_START) ?
TEXTBLOCK_POSITION_SINGLE : TEXTBLOCK_POSITION_END; TEXTBLOCK_POSITION_SINGLE : TEXTBLOCK_POSITION_END;
@ -4468,7 +4473,7 @@ _layout_paragraph_reorder_lines(Evas_Object_Textblock_Paragraph *par)
} }
#endif #endif
static void static inline void
_layout_paragraph_render(Evas_Object_Textblock *o, _layout_paragraph_render(Evas_Object_Textblock *o,
Evas_Object_Textblock_Paragraph *par) Evas_Object_Textblock_Paragraph *par)
{ {
@ -4700,6 +4705,7 @@ _layout_par(Ctxt *c)
eina_inlist_remove( eina_inlist_remove(
EINA_INLIST_GET(c->ln->items), EINA_INLIST_GET(c->ln->items),
EINA_INLIST_GET(it))); EINA_INLIST_GET(it)));
it->ln = c->ln;
i = eina_list_prev(i); i = eina_list_prev(i);
it = eina_list_data_get(i); it = eina_list_data_get(i);
} }
@ -4769,6 +4775,7 @@ _layout_par(Ctxt *c)
c->ln->items = (Evas_Object_Textblock_Item *) c->ln->items = (Evas_Object_Textblock_Item *)
eina_inlist_append(EINA_INLIST_GET(c->ln->items), eina_inlist_append(EINA_INLIST_GET(c->ln->items),
EINA_INLIST_GET(it)); EINA_INLIST_GET(it));
it->ln = c->ln;
if (it->type == EVAS_TEXTBLOCK_ITEM_FORMAT) if (it->type == EVAS_TEXTBLOCK_ITEM_FORMAT)
{ {
Evas_Object_Textblock_Format_Item *fi; Evas_Object_Textblock_Format_Item *fi;
@ -10706,10 +10713,16 @@ evas_object_textblock_render(Evas_Object *eo_obj EINA_UNUSED,
int x, int y, Eina_Bool do_async) int x, int y, Eina_Bool do_async)
{ {
Evas_Object_Textblock_Paragraph *par, *start = NULL; Evas_Object_Textblock_Paragraph *par, *start = NULL;
Evas_Object_Textblock_Item *itr;
Evas_Object_Textblock_Line *ln; Evas_Object_Textblock_Line *ln;
Evas_Object_Textblock *o = type_private_data; Evas_Object_Textblock *o = type_private_data;
Eina_List *shadows = NULL;
Eina_List *glows = NULL;
Eina_List *outlines = NULL;
int i, j; int i, j;
int cx, cy, cw, ch, clip; int cx, cy, cw, ch, clip;
int ca, cr, cg, cb;
int na, nr, ng, nb;
const char vals[5][5] = const char vals[5][5] =
{ {
{0, 1, 2, 1, 0}, {0, 1, 2, 1, 0},
@ -10718,9 +10731,6 @@ evas_object_textblock_render(Evas_Object *eo_obj EINA_UNUSED,
{1, 3, 4, 3, 1}, {1, 3, 4, 3, 1},
{0, 1, 2, 1, 0} {0, 1, 2, 1, 0}
}; };
Eina_Bool have_shadow = EINA_FALSE;
Eina_Bool have_glow = EINA_FALSE;
Eina_Bool have_outline = EINA_FALSE;
/* render object to surface with context, and offxet by x,y */ /* render object to surface with context, and offxet by x,y */
obj->layer->evas->engine.func->context_multiplier_unset(output, obj->layer->evas->engine.func->context_multiplier_unset(output,
@ -10737,6 +10747,9 @@ evas_object_textblock_render(Evas_Object *eo_obj EINA_UNUSED,
* there's nothing left to do. */ * there's nothing left to do. */
if (!o->paragraphs) return; if (!o->paragraphs) return;
ENFN->context_color_set(output, context, 0, 0, 0, 0);
ca = cr = cg = cb = 0;
#define ITEM_WALK() \ #define ITEM_WALK() \
EINA_INLIST_FOREACH(start, par) \ EINA_INLIST_FOREACH(start, par) \
{ \ { \
@ -10751,8 +10764,6 @@ evas_object_textblock_render(Evas_Object *eo_obj EINA_UNUSED,
_layout_paragraph_render(o, par); \ _layout_paragraph_render(o, par); \
EINA_INLIST_FOREACH(par->lines, ln) \ EINA_INLIST_FOREACH(par->lines, ln) \
{ \ { \
Evas_Object_Textblock_Item *itr; \
\
if (clip) \ if (clip) \
{ \ { \
if ((obj->cur->geometry.y + y + par->y + ln->y + ln->h) < (cy - 20)) \ if ((obj->cur->geometry.y + y + par->y + ln->y + ln->h) < (cy - 20)) \
@ -10768,6 +10779,7 @@ evas_object_textblock_render(Evas_Object *eo_obj EINA_UNUSED,
{ \ { \
yoff += itr->format->valign * (ln->h - itr->h); \ yoff += itr->format->valign * (ln->h - itr->h); \
} \ } \
itr->yoff = yoff; \
if (clip) \ if (clip) \
{ \ { \
if ((obj->cur->geometry.x + x + ln->x + itr->x + itr->w) < (cx - 20)) \ if ((obj->cur->geometry.x + x + ln->x + itr->x + itr->w) < (cx - 20)) \
@ -10786,17 +10798,27 @@ evas_object_textblock_render(Evas_Object *eo_obj EINA_UNUSED,
} \ } \
do {} while(0) do {} while(0)
#define COLOR_SET(col) \ #define COLOR_SET(col) \
nr = obj->cur->cache.clip.r * ti->parent.format->color.col.r; \
ng = obj->cur->cache.clip.g * ti->parent.format->color.col.g; \
nb = obj->cur->cache.clip.b * ti->parent.format->color.col.b; \
na = obj->cur->cache.clip.a * ti->parent.format->color.col.a; \
if (na != ca || nb != cb || ng != cg || nr != cr) \
{ \
ENFN->context_color_set(output, context, \ ENFN->context_color_set(output, context, \
(obj->cur->cache.clip.r * ti->parent.format->color.col.r) / 255, \ nr / 255, ng / 255, nb / 255, na / 255); \
(obj->cur->cache.clip.g * ti->parent.format->color.col.g) / 255, \ cr = nr; cg = ng; cb = nb; ca = na; \
(obj->cur->cache.clip.b * ti->parent.format->color.col.b) / 255, \ }
(obj->cur->cache.clip.a * ti->parent.format->color.col.a) / 255);
#define COLOR_SET_AMUL(col, amul) \ #define COLOR_SET_AMUL(col, amul) \
nr = obj->cur->cache.clip.r * ti->parent.format->color.col.r * (amul); \
ng = obj->cur->cache.clip.g * ti->parent.format->color.col.g * (amul); \
nb = obj->cur->cache.clip.b * ti->parent.format->color.col.b * (amul); \
na = obj->cur->cache.clip.a * ti->parent.format->color.col.a * (amul); \
if (na != ca || nb != cb || ng != cg || nr != cr) \
{ \
ENFN->context_color_set(output, context, \ ENFN->context_color_set(output, context, \
(obj->cur->cache.clip.r * ti->parent.format->color.col.r * (amul)) / 65025, \ nr / 65025, ng / 65025, nb / 65025, na / 65025); \
(obj->cur->cache.clip.g * ti->parent.format->color.col.g * (amul)) / 65025, \ cr = nr; cg = ng; cb = nb; ca = na; \
(obj->cur->cache.clip.b * ti->parent.format->color.col.b * (amul)) / 65025, \ }
(obj->cur->cache.clip.a * ti->parent.format->color.col.a * (amul)) / 65025);
#define DRAW_TEXT(ox, oy) \ #define DRAW_TEXT(ox, oy) \
if (ti->parent.format->font.font) \ if (ti->parent.format->font.font) \
evas_font_draw_async_check(obj, output, context, surface, \ evas_font_draw_async_check(obj, output, context, surface, \
@ -10810,12 +10832,16 @@ evas_object_textblock_render(Evas_Object *eo_obj EINA_UNUSED,
#define DRAW_RECT(ox, oy, ow, oh, or, og, ob, oa) \ #define DRAW_RECT(ox, oy, ow, oh, or, og, ob, oa) \
do \ do \
{ \ { \
ENFN->context_color_set(output, \ nr = obj->cur->cache.clip.r * or; \
context, \ ng = obj->cur->cache.clip.g * og; \
(obj->cur->cache.clip.r * or) / 255, \ nb = obj->cur->cache.clip.b * ob; \
(obj->cur->cache.clip.g * og) / 255, \ na = obj->cur->cache.clip.a * oa; \
(obj->cur->cache.clip.b * ob) / 255, \ if (na != ca || nb != cb || ng != cg || nr != cr) \
(obj->cur->cache.clip.a * oa) / 255); \ { \
ENFN->context_color_set(output, context, \
cr / 255, cg / 255, cb / 255, ca / 255); \
cr = nr; cg = ng; cb = nb; ca = na; \
} \
ENFN->rectangle_draw(output, \ ENFN->rectangle_draw(output, \
context, \ context, \
surface, \ surface, \
@ -10893,8 +10919,6 @@ evas_object_textblock_render(Evas_Object *eo_obj EINA_UNUSED,
ITEM_WALK() ITEM_WALK()
{ {
/* Check which other pass are necessary to avoid useless WALK */ /* Check which other pass are necessary to avoid useless WALK */
if (!have_shadow && !have_glow && !have_outline)
{
Evas_Object_Textblock_Text_Item *ti; Evas_Object_Textblock_Text_Item *ti;
ti = (itr->type == EVAS_TEXTBLOCK_ITEM_TEXT) ? _ITEM_TEXT(itr) : NULL; ti = (itr->type == EVAS_TEXTBLOCK_ITEM_TEXT) ? _ITEM_TEXT(itr) : NULL;
@ -10907,24 +10931,23 @@ evas_object_textblock_render(Evas_Object *eo_obj EINA_UNUSED,
EVAS_TEXT_STYLE_FAR_SOFT_SHADOW | EVAS_TEXT_STYLE_FAR_SOFT_SHADOW |
EVAS_TEXT_STYLE_SOFT_SHADOW)) EVAS_TEXT_STYLE_SOFT_SHADOW))
{ {
have_shadow = EINA_TRUE; shadows = eina_list_append(shadows, itr);
} }
if ((ti->parent.format->style & EVAS_TEXT_STYLE_MASK_BASIC) == if ((ti->parent.format->style & EVAS_TEXT_STYLE_MASK_BASIC) ==
EVAS_TEXT_STYLE_GLOW) EVAS_TEXT_STYLE_GLOW)
{ {
have_glow = EINA_TRUE; glows = eina_list_append(glows, itr);
} }
if (((ti->parent.format->style & EVAS_TEXT_STYLE_MASK_BASIC) == EVAS_TEXT_STYLE_OUTLINE) || if (((ti->parent.format->style & EVAS_TEXT_STYLE_MASK_BASIC) == EVAS_TEXT_STYLE_OUTLINE) ||
((ti->parent.format->style & EVAS_TEXT_STYLE_MASK_BASIC) == EVAS_TEXT_STYLE_OUTLINE_SHADOW) || ((ti->parent.format->style & EVAS_TEXT_STYLE_MASK_BASIC) == EVAS_TEXT_STYLE_OUTLINE_SHADOW) ||
((ti->parent.format->style & EVAS_TEXT_STYLE_MASK_BASIC) == EVAS_TEXT_STYLE_OUTLINE_SOFT_SHADOW) || ((ti->parent.format->style & EVAS_TEXT_STYLE_MASK_BASIC) == EVAS_TEXT_STYLE_OUTLINE_SOFT_SHADOW) ||
(ti->parent.format->style == EVAS_TEXT_STYLE_SOFT_OUTLINE)) (ti->parent.format->style == EVAS_TEXT_STYLE_SOFT_OUTLINE))
{ {
have_outline = EINA_TRUE; outlines = eina_list_append(outlines, itr);
} }
} }
} /* Draw background */
DRAW_FORMAT(backing, 0, ln->h); DRAW_FORMAT(backing, 0, ln->h);
} }
ITEM_WALK_END(); ITEM_WALK_END();
@ -10935,15 +10958,18 @@ evas_object_textblock_render(Evas_Object *eo_obj EINA_UNUSED,
/* prepare everything for text draw */ /* prepare everything for text draw */
/* shadows */ /* shadows */
if (have_shadow) EINA_LIST_FREE(shadows, itr)
{
ITEM_WALK()
{ {
int shad_dst, shad_sz, dx, dy, haveshad; int shad_dst, shad_sz, dx, dy, haveshad;
Evas_Object_Textblock_Text_Item *ti; Evas_Object_Textblock_Text_Item *ti;
Evas_Coord yoff;
ti = (itr->type == EVAS_TEXTBLOCK_ITEM_TEXT) ? _ITEM_TEXT(itr) : NULL; ti = (itr->type == EVAS_TEXTBLOCK_ITEM_TEXT) ? _ITEM_TEXT(itr) : NULL;
if (!ti) continue; if (!ti) continue;
yoff = itr->yoff;
ln = itr->ln;
shad_dst = shad_sz = dx = dy = haveshad = 0; shad_dst = shad_sz = dx = dy = haveshad = 0;
switch (ti->parent.format->style & EVAS_TEXT_STYLE_MASK_BASIC) switch (ti->parent.format->style & EVAS_TEXT_STYLE_MASK_BASIC)
{ {
@ -11041,18 +11067,19 @@ evas_object_textblock_render(Evas_Object *eo_obj EINA_UNUSED,
} }
} }
} }
ITEM_WALK_END();
}
/* glows */ /* glows */
if (have_glow) EINA_LIST_FREE(glows, itr)
{
ITEM_WALK()
{ {
Evas_Object_Textblock_Text_Item *ti; Evas_Object_Textblock_Text_Item *ti;
Evas_Coord yoff;
ti = (itr->type == EVAS_TEXTBLOCK_ITEM_TEXT) ? _ITEM_TEXT(itr) : NULL; ti = (itr->type == EVAS_TEXTBLOCK_ITEM_TEXT) ? _ITEM_TEXT(itr) : NULL;
if (!ti) continue; if (!ti) continue;
yoff = itr->yoff;
ln = itr->ln;
if ((ti->parent.format->style & EVAS_TEXT_STYLE_MASK_BASIC) == EVAS_TEXT_STYLE_GLOW) if ((ti->parent.format->style & EVAS_TEXT_STYLE_MASK_BASIC) == EVAS_TEXT_STYLE_GLOW)
{ {
for (j = 0; j < 5; j++) for (j = 0; j < 5; j++)
@ -11073,18 +11100,19 @@ evas_object_textblock_render(Evas_Object *eo_obj EINA_UNUSED,
DRAW_TEXT(0, 1); DRAW_TEXT(0, 1);
} }
} }
ITEM_WALK_END();
}
/* outlines */ /* outlines */
if (have_outline) EINA_LIST_FREE(outlines, itr)
{
ITEM_WALK()
{ {
Evas_Object_Textblock_Text_Item *ti; Evas_Object_Textblock_Text_Item *ti;
Evas_Coord yoff;
ti = (itr->type == EVAS_TEXTBLOCK_ITEM_TEXT) ? _ITEM_TEXT(itr) : NULL; ti = (itr->type == EVAS_TEXTBLOCK_ITEM_TEXT) ? _ITEM_TEXT(itr) : NULL;
if (!ti) continue; if (!ti) continue;
yoff = itr->yoff;
ln = itr->ln;
if (((ti->parent.format->style & EVAS_TEXT_STYLE_MASK_BASIC) == EVAS_TEXT_STYLE_OUTLINE) || if (((ti->parent.format->style & EVAS_TEXT_STYLE_MASK_BASIC) == EVAS_TEXT_STYLE_OUTLINE) ||
((ti->parent.format->style & EVAS_TEXT_STYLE_MASK_BASIC) == EVAS_TEXT_STYLE_OUTLINE_SHADOW) || ((ti->parent.format->style & EVAS_TEXT_STYLE_MASK_BASIC) == EVAS_TEXT_STYLE_OUTLINE_SHADOW) ||
((ti->parent.format->style & EVAS_TEXT_STYLE_MASK_BASIC) == EVAS_TEXT_STYLE_OUTLINE_SOFT_SHADOW)) ((ti->parent.format->style & EVAS_TEXT_STYLE_MASK_BASIC) == EVAS_TEXT_STYLE_OUTLINE_SOFT_SHADOW))
@ -11110,8 +11138,6 @@ evas_object_textblock_render(Evas_Object *eo_obj EINA_UNUSED,
} }
} }
} }
ITEM_WALK_END();
}
/* normal text and lines */ /* normal text and lines */
/* Get the thickness and position, and save them for non-text items. */ /* Get the thickness and position, and save them for non-text items. */