hermet pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=b3d11fae4c2fb6b87498ecabfbc2ee693b2e002e
commit b3d11fae4c2fb6b87498ecabfbc2ee693b2e002e Author: ChunEon Park <[email protected]> Date: Mon Jul 7 17:06:42 2014 +0900 evas/gl - removed MASK ramains. --- src/modules/evas/engines/gl_common/evas_gl_common.h | 7 ++----- src/modules/evas/engines/gl_common/evas_gl_context.c | 3 --- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/src/modules/evas/engines/gl_common/evas_gl_common.h b/src/modules/evas/engines/gl_common/evas_gl_common.h index fb1281e..94e8ce4 100644 --- a/src/modules/evas/engines/gl_common/evas_gl_common.h +++ b/src/modules/evas/engines/gl_common/evas_gl_common.h @@ -290,8 +290,6 @@ typedef enum { SHADER_RECT, SHADER_FONT, - SHADER_IMG_MASK, - SHADER_IMG, SHADER_IMG_NOMUL, SHADER_IMG_BGRA, @@ -462,9 +460,8 @@ struct _Evas_GL_Shared #define RTYPE_FONT 3 #define RTYPE_YUV 4 #define RTYPE_MAP 5 /* need to merge with image */ -#define RTYPE_IMASK 6 -#define RTYPE_YUY2 7 -#define RTYPE_NV12 8 +#define RTYPE_YUY2 6 +#define RTYPE_NV12 7 #define ARRAY_BUFFER_USE 500 #define ARRAY_BUFFER_USE_SHIFT 100 diff --git a/src/modules/evas/engines/gl_common/evas_gl_context.c b/src/modules/evas/engines/gl_common/evas_gl_context.c index d3204c3..22bb159 100644 --- a/src/modules/evas/engines/gl_common/evas_gl_context.c +++ b/src/modules/evas/engines/gl_common/evas_gl_context.c @@ -861,9 +861,6 @@ evas_gl_common_context_new(void) SHADER_TEXTURE_ADD(shared, NV12_NOMUL, tex); SHADER_TEXTURE_ADD(shared, NV12_NOMUL, texuv); - SHADER_TEXTURE_ADD(shared, IMG_MASK, tex); - SHADER_TEXTURE_ADD(shared, IMG_MASK, texm); - if (gc->state.current.cur_prog == PRG_INVALID) glUseProgram(shared->shader[0].prog); else glUseProgram(gc->state.current.cur_prog); --
