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

Evas masking: Also fix map masking with non-bgra images

This commit is contained in:
Jean-Philippe Andre 2015-02-06 12:31:24 +09:00
parent 92954b707c
commit 73b16a4962
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/modules/evas/engines/gl_common/shader/evas_gl_shaders.x
View File

@ -2733,7 +2733,7 @@ static const char const map_mask_vert_glsl[] =
"precision highp float;\n" "precision highp float;\n"
"#endif\n" "#endif\n"
"attribute vec4 vertex, color;\n" "attribute vec4 vertex, color;\n"
"attribute vec2 tex_coord, tex_coordm, tex_sample;\n" "attribute vec2 tex_coord, tex_coordm, tex_sample, tex_coorda;\n"
"uniform mat4 mvp;\n" "uniform mat4 mvp;\n"
"varying vec2 tex_c;\n" "varying vec2 tex_c;\n"
"varying vec4 mask_Position, col, mask_Absolute;\n" "varying vec4 mask_Position, col, mask_Absolute;\n"
@ -2743,7 +2743,7 @@ static const char const map_mask_vert_glsl[] =
" tex_c = tex_coord;\n" " tex_c = tex_coord;\n"
" col = color;\n" " col = color;\n"
" // Assume Y-invert on mask, normalize (screen to texture mode coordinates)\n" " // Assume Y-invert on mask, normalize (screen to texture mode coordinates)\n"
" mask_Position = mvp * vertex * vec4(0.5, -0.5, 0.5, 0.5) + vec4(0.5, 0.5, 0, 0);\n" " mask_Position = mvp * vertex * vec4(0.5, tex_coorda.y * 0.5, 0.5, 0.5) + vec4(0.5, 0.5, 0, 0);\n"
" mask_Absolute = vec4(tex_coordm, tex_sample); // x, y, 1/w, 1/h on canvas in GL coords\n" " mask_Absolute = vec4(tex_coordm, tex_sample); // x, y, 1/w, 1/h on canvas in GL coords\n"
"}\n"; "}\n";
Evas_GL_Program_Source shader_map_mask_vert_src = Evas_GL_Program_Source shader_map_mask_vert_src =

9
src/modules/evas/engines/gl_common/shader/map_mask_vert.shd
View File

@ -2,7 +2,7 @@
precision highp float; precision highp float;
#endif #endif
attribute vec4 vertex, color; attribute vec4 vertex, color;
attribute vec2 tex_coord, tex_coordm, tex_sample; attribute vec2 tex_coord, tex_coordm, tex_sample, tex_coorda;
uniform mat4 mvp; uniform mat4 mvp;
varying vec2 tex_c; varying vec2 tex_c;
varying vec4 mask_Position, col, mask_Absolute; varying vec4 mask_Position, col, mask_Absolute;
@ -12,7 +12,10 @@ void main()
tex_c = tex_coord; tex_c = tex_coord;
col = color; col = color;
// Assume Y-invert on mask, normalize (screen to texture mode coordinates) // tex_coorda contains the Y-invert flag
mask_Position = mvp * vertex * vec4(0.5, -0.5, 0.5, 0.5) + vec4(0.5, 0.5, 0, 0); // tex_coordm contains the X,Y position of the mask
// tex_sample contains the W,H size of the mask (inverted)
mask_Position = mvp * vertex * vec4(tex_coorda.x * 0.5, tex_coorda.y * 0.5, 0.5, 0.5) + vec4(0.5, 0.5, 0, 0);
mask_Absolute = vec4(tex_coordm, tex_sample); // x, y, 1/w, 1/h on canvas in GL coords mask_Absolute = vec4(tex_coordm, tex_sample); // x, y, 1/w, 1/h on canvas in GL coords
} }