[evas] bugfix - color format of native tbm surface

 there is color format bug in camera test, so change shader code
 and DDK modification is necessary

Change-Id: I547199174aa063453baefaa1c4b48ff8926f6b79

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
old mode 100644 (file)
new mode 100755 (executable)
index 4826b6c..2e96127
--- a/src/modules/evas/engines/gl_common/shader/evas_gl_shaders.x
+++ b/src/modules/evas/engines/gl_common/shader/evas_gl_shaders.x
@@ -125,7 +125,9 @@ static const char fragment_glsl[] =
    "   vec4 col10 = texture2D(tex, tex_c + tex_s[2]).SWZ;\n"
    "   vec4 col11 = texture2D(tex, tex_c + tex_s[3]).SWZ;\n"
    "   c = (col00 + col01 + col10 + col11) / div_s;\n"
-   "#elif defined(SHD_TEX) || defined(SHD_EXTERNAL)\n"
+   "#elif defined(SHD_EXTERNAL)\n"
+   "   c = texture2D(tex, tex_c);\n"
+   "#elif defined(SHD_TEX)\n"
    "   c = texture2D(tex, tex_c).SWZ;\n"
    "#else\n"
    "   c = vec4(1, 1, 1, 1);\n"

diff --git a/src/modules/evas/engines/gl_common/shader/fragment.glsl b/src/modules/evas/engines/gl_common/shader/fragment.glsl
old mode 100644 (file)
new mode 100755 (executable)
index b534961..19d9c69
--- a/src/modules/evas/engines/gl_common/shader/fragment.glsl
+++ b/src/modules/evas/engines/gl_common/shader/fragment.glsl
@@ -124,7 +124,10 @@ void main()
    vec4 col11 = texture2D(tex, tex_c + tex_s[3]).SWZ;
    c = (col00 + col01 + col10 + col11) / div_s;
 
-#elif defined(SHD_TEX) || defined(SHD_EXTERNAL)
+#elif defined(SHD_EXTERNAL)
+   c = texture2D(tex, tex_c);
+
+#elif defined(SHD_TEX)
    c = texture2D(tex, tex_c).SWZ;
 
 #else