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

Evas masking: Remove map_mask shaders 

Those are now duplicates of IMG_MASK
This commit is contained in:
Jean-Philippe Andre 2015-04-01 16:40:09 +09:00
parent ac11a9cb36
commit 8586b75a2a
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/modules/evas/engines/gl_common/evas_gl_context.c
View File

@ -938,11 +938,6 @@ evas_gl_common_context_new(void)
SHADER_TEXTURE_ADD(shared, IMG_MASK_BGRA_NOMUL, tex);
SHADER_TEXTURE_ADD(shared, IMG_MASK_BGRA_NOMUL, texm);
SHADER_TEXTURE_ADD(shared, MAP_MASK_BGRA, tex);
SHADER_TEXTURE_ADD(shared, MAP_MASK_BGRA, texm);
SHADER_TEXTURE_ADD(shared, MAP_MASK_BGRA_NOMUL, tex);
SHADER_TEXTURE_ADD(shared, MAP_MASK_BGRA_NOMUL, texm);
SHADER_TEXTURE_ADD(shared, FONT_MASK, tex);
SHADER_TEXTURE_ADD(shared, FONT_MASK, texm);
@ -2608,13 +2603,13 @@ evas_gl_common_context_image_map_push(Evas_Engine_GL_Context *gc,
{
shader = evas_gl_common_shader_choice(npoints, p, r, g, b, a, !!mtex,
SHADER_IMG_BGRA_NOMUL, SHADER_IMG_BGRA,
SHADER_MAP_MASK_BGRA_NOMUL, SHADER_MAP_MASK_BGRA);
SHADER_IMG_MASK_BGRA_NOMUL, SHADER_IMG_MASK_BGRA);
}
else
{
shader = evas_gl_common_shader_choice(npoints, p, r, g, b, a, !!mtex,
SHADER_TEX_NOMUL, SHADER_TEX,
SHADER_MAP_MASK_BGRA_NOMUL, SHADER_MAP_MASK_BGRA);
SHADER_IMG_MASK_BGRA_NOMUL, SHADER_IMG_MASK_BGRA);
}
}
else
@ -2623,13 +2618,13 @@ evas_gl_common_context_image_map_push(Evas_Engine_GL_Context *gc,
{
shader = evas_gl_common_shader_choice(npoints, p, r, g, b, a, !!mtex,
SHADER_IMG_BGRA_NOMUL, SHADER_IMG_BGRA,
SHADER_MAP_MASK_BGRA_NOMUL, SHADER_MAP_MASK_BGRA);
SHADER_IMG_MASK_BGRA_NOMUL, SHADER_IMG_MASK_BGRA);
}
else
{
shader = evas_gl_common_shader_choice(npoints, p, r, g, b, a, !!mtex,
SHADER_IMG_NOMUL, SHADER_IMG,
SHADER_MAP_MASK_NOMUL, SHADER_MAP_MASK);
SHADER_IMG_MASK_NOMUL, SHADER_IMG_MASK);
}
}
}