aboutsummaryrefslogtreecommitdiffstats
path: root/src/modules/evas/engines/gl_common/evas_gl_font.c
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2015-04-01 09:58:05 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2015-04-01 09:59:49 +0900
commit740995e089c3318585875ed000490426e22bfc11 (patch)
tree8e30e4cc53266ad78d2fde3a354f2372cc9e83e5 /src/modules/evas/engines/gl_common/evas_gl_font.c
parentEvas masking: Refactor GL code (diff)
downloadefl-740995e089c3318585875ed000490426e22bfc11.tar.gz
Evas GL generic: Simplify "scaled" images (used for masking)
Invert the meaning of scaled (w,h), so that im->(w,h) corresponds to the final scaled size, and the original size is stored directly in the texture itself. This simplifies code a little bit. Also, lift the limitation on the maximum texture size, as those virtual textures are not limited by GPU texture size.
Diffstat (limited to 'src/modules/evas/engines/gl_common/evas_gl_font.c')
-rw-r--r--src/modules/evas/engines/gl_common/evas_gl_font.c18
1 files changed, 5 insertions, 13 deletions
diff --git a/src/modules/evas/engines/gl_common/evas_gl_font.c b/src/modules/evas/engines/gl_common/evas_gl_font.c
index 95ac669f50..f7001fbe64 100644
--- a/src/modules/evas/engines/gl_common/evas_gl_font.c
+++ b/src/modules/evas/engines/gl_common/evas_gl_font.c
@@ -85,19 +85,11 @@ evas_gl_font_texture_draw(void *context, void *surface EINA_UNUSED, void *draw_c
if (mtex && mtex->pt && mtex->pt->w && mtex->pt->h)
{
// canvas coords
- mx = dc->clip.mask_x;
- my = dc->clip.mask_y;
- if (mask->scaled.origin)
- {
- mw = mask->scaled.w;
- mh = mask->scaled.h;
- mask_smooth = mask->scaled.smooth;
- }
- else
- {
- mw = mask->w;
- mh = mask->h;
- }
+ mx = gc->dc->clip.mask_x;
+ my = gc->dc->clip.mask_y;
+ mw = mask->w;
+ mh = mask->h;
+ mask_smooth = mask->scaled.smooth;
}
else mtex = NULL;