jpeg pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=88e5369eeeba803d44374a577b09f34d5d0f3016

commit 88e5369eeeba803d44374a577b09f34d5d0f3016
Author: Jean-Philippe Andre <jp.an...@samsung.com>
Date:   Fri Feb 6 12:35:12 2015 +0900

    Evas masking: Add forgotten file in previous commit
---
 src/modules/evas/engines/gl_common/shader/evas_gl_shaders.x | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/modules/evas/engines/gl_common/shader/evas_gl_shaders.x 
b/src/modules/evas/engines/gl_common/shader/evas_gl_shaders.x
index 2264f5c..09ea407 100644
--- a/src/modules/evas/engines/gl_common/shader/evas_gl_shaders.x
+++ b/src/modules/evas/engines/gl_common/shader/evas_gl_shaders.x
@@ -2742,8 +2742,10 @@ static const char const map_mask_vert_glsl[] =
    "   gl_Position = mvp * vertex;\n"
    "   tex_c = tex_coord;\n"
    "   col = color;\n"
-   "   // Assume Y-invert on mask, normalize (screen to texture mode 
coordinates)\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"
+   "   // tex_coorda contains the Y-invert flag\n"
+   "   // tex_coordm contains the X,Y position of the mask\n"
+   "   // tex_sample contains the W,H size of the mask (inverted)\n"
+   "   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);\n"
    "   mask_Absolute = vec4(tex_coordm, tex_sample); // x, y, 1/w, 1/h on 
canvas in GL coords\n"
    "}\n";
 Evas_GL_Program_Source shader_map_mask_vert_src =

-- 


Reply via email to