Remove shader test code
authorHeeyong Song <heeyong.song@samsung.com>
Mon, 2 Dec 2013 05:54:41 +0000 (14:54 +0900)
committerGerrit Code Review <gerrit@gerrit.vlan144.tizendev.org>
Mon, 2 Dec 2013 05:55:37 +0000 (05:55 +0000)
Change-Id: Ib77c6488225275326b09522646b899e6a3712d5b

src/ui/animations/platform/FUiAnim_GlContext.cpp

index 60b2bb6..0a69a4a 100644 (file)
@@ -983,8 +983,7 @@ _GlContext::PrepareDefaultShaders(void)
                        "varying vec4 v_color;\n"
                        "void main()\n"
                        "{\n"
-                       "//     gl_FragColor.rgba = texture2D(u_tex2d, v_texcoord).bgra * v_color;\n"
-                       "       gl_FragColor.rgba = v_color;\n"
+                       "       gl_FragColor.rgba = texture2D(u_tex2d, v_texcoord).bgra * v_color;\n"
                        "}\n";
 
        static const char strFragmentShader_PerPixellight[] =
@@ -1112,8 +1111,7 @@ _GlContext::PrepareDefaultShaders(void)
                        "       vec3 v = normalize(u_eyePosition - v_position.xyz);\n"
                        "       vec3 r = reflect(-v, normal);\n"
                        "       \n"
-                       "//     diffuse =  u_light[i].diffuse * u_material.diffuse * texture2D(u_tex2d, v_texcoord).bgra * max(0.0, dot(lightdir, normal));\n"
-                       "       diffuse =  u_light[i].diffuse * u_material.diffuse * max(0.0, dot(lightdir, normal));\n"
+                       "       diffuse =  u_light[i].diffuse * u_material.diffuse * texture2D(u_tex2d, v_texcoord).bgra * max(0.0, dot(lightdir, normal));\n"
                        "       ambient = u_light[i].ambient * u_material.ambient;\n"
                        "       specular =  u_light[i].specular * u_material.specular * pow(max(dot(r, lightdir), 0.0), u_material.shininess);\n"
                        "       \n"