hermet pushed a commit to branch efl-1.10. http://git.enlightenment.org/core/efl.git/commit/?id=94dd1f1db4ab34a683120a99dcfce742f6335ecc
commit 94dd1f1db4ab34a683120a99dcfce742f6335ecc Author: ChunEon Park <[email protected]> Date: Mon Jul 7 17:21:08 2014 +0900 Revert "evas/gl - removed MASK ramains." This reverts commit f5d8d7ba1f1d64b31bca97def624c48a7e20b584. oops. this patch shouldn't be in efl-1.10 branch. --- 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, 8 insertions(+), 2 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 46466cd..e206af5 100644 --- a/src/modules/evas/engines/gl_common/evas_gl_common.h +++ b/src/modules/evas/engines/gl_common/evas_gl_common.h @@ -276,6 +276,8 @@ typedef enum { SHADER_RECT, SHADER_FONT, + SHADER_IMG_MASK, + SHADER_IMG, SHADER_IMG_NOMUL, SHADER_IMG_BGRA, @@ -447,8 +449,9 @@ struct _Evas_GL_Shared #define RTYPE_FONT 3 #define RTYPE_YUV 4 #define RTYPE_MAP 5 /* need to merge with image */ -#define RTYPE_YUY2 6 -#define RTYPE_NV12 7 +#define RTYPE_IMASK 6 +#define RTYPE_YUY2 7 +#define RTYPE_NV12 8 #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 4f67b12..fd8bbc9 100644 --- a/src/modules/evas/engines/gl_common/evas_gl_context.c +++ b/src/modules/evas/engines/gl_common/evas_gl_context.c @@ -863,6 +863,9 @@ 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); --
