enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 3 Projects Releases Wiki Activity

Don't try and render wordcache if GL is on, and metric cache is enabled. 

SVN revision: 50586
This commit is contained in:
Brett Nash 2010-07-28 07:33:23 +00:00
parent 93d98ebedf
commit 507834e27d
1 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
legacy/evas/src/lib/engines/common/evas_font_draw.c
View File

@ -449,9 +449,12 @@ evas_common_font_draw_internal(RGBA_Image *dst, RGBA_Draw_Context *dc, RGBA_Font
if (xrun < 1) return;
#ifdef WORD_CACHE
for (j = rowstart ; j < rowend ; j ++){
func(NULL, word->im + (word->roww * j) + xstart, dc->col.col,
im + ((y + j) * im_w) + x, xrun);
if (word->im){
for (j = rowstart ; j < rowend ; j ++){
func(NULL, word->im + (word->roww * j) + xstart, dc->col.col,
im + ((y + j) * im_w) + x, xrun);
}
return;
}
#elif defined(METRIC_CACHE)
int ind;
@ -459,19 +462,20 @@ evas_common_font_draw_internal(RGBA_Image *dst, RGBA_Draw_Context *dc, RGBA_Font
for (ind = 0 ; ind < len ; ind ++){
// FIXME Do we need to draw?
struct cinfo *ci = word->cinfo + ind;
if ((ci->fg->ext_dat) && (dc->font_ext.func.gl_draw))
{
/* ext glyph draw */
dc->font_ext.func.gl_draw(dc->font_ext.data,
(void *)dst,
dc, ci->fg,
x + ci->pos.x,
y - ci->bm.h
);
}
else {
func(NULL, word->im + (word->roww * j) + xstart, dc->col.col, im + ((y + j) * im_w) + x, xrun);
}
if ((ci->fg->ext_dat) && (dc->font_ext.func.gl_draw))
{
/* ext glyph draw */
dc->font_ext.func.gl_draw(dc->font_ext.data,
(void *)dst,
dc, ci->fg,
x + ci->pos.x,
y - ci->bm.h
);
}
else
{
func(NULL, word->im + (word->roww * j) + xstart, dc->col.col, im + ((y + j) * im_w) + x, xrun);
}
}
#endif
return;