From: Jean-Philippe Andre <jp.andre@samsung.com>
Date: Fri, 12 Aug 2016 02:09:16 +0000 (+0900)
Subject: evas: Fix shader for text masking
X-Git-Tag: accepted/tizen/common/20170102.152350~230
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d319e0cb158102fcde5c75888df607e6bb2b129c;p=platform%2Fupstream%2Fefl.git

evas: Fix shader for text masking

Fixes T4338

@fix

Change-Id: I0996d717e591657c059bda440301cd8a362d05f8
---

diff --git a/src/modules/evas/engines/gl_common/evas_gl_shader.c b/src/modules/evas/engines/gl_common/evas_gl_shader.c
index 29ceb2f..9a3e9b3 100644
--- a/src/modules/evas/engines/gl_common/evas_gl_shader.c
+++ b/src/modules/evas/engines/gl_common/evas_gl_shader.c
@@ -814,13 +814,13 @@ evas_gl_common_shader_flags_get(Evas_GL_Shared *shared, Shader_Type type,
      }
 //
 
-   if (mtex)
-     flags |= SHADER_FLAG_MASK;
-
    if (bgra)
      flags |= SHADER_FLAG_BGRA;
 
 end:
+   if (mtex)
+     flags |= SHADER_FLAG_MASK;
+
    if (psam) *psam = sam;
    if (pnomul) *pnomul = nomul;
    if (pmasksam) *pmasksam = masksam;