From: Neil Roberts Date: Wed, 19 Oct 2011 12:42:18 +0000 (+0100) Subject: tests: Use the portable cogl wrappers for GLSL builtins X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b240b95a97a220f760c06fe09cde3eeb91fed581;p=profile%2Fivi%2Fclutter.git tests: Use the portable cogl wrappers for GLSL builtins Instead of directly using the GLSL names for the builtins in the shaders for test-shader and test-pick, this makes it use the Cogl wrapper names instead. That way it will be portable to GLES2 as well. Reviewed-by: Emmanuele Bassi --- diff --git a/tests/conform/test-pick.c b/tests/conform/test-pick.c index c10a6b0..b3cbd74 100644 --- a/tests/conform/test-pick.c +++ b/tests/conform/test-pick.c @@ -55,8 +55,8 @@ shader_paint (ClutterEffect *effect, "uniform float step;\n" "void main (void)\n" "{\n" - " gl_FragColor = texture2D(tex, vec2 (gl_TexCoord[0].s + step,\n" - " gl_TexCoord[0].t));\n" + " cogl_color_out = texture2D(tex, vec2 (cogl_tex_coord_in[0].s + step,\n" + " cogl_tex_coord_in[0].t));\n" "}\n"); tex_width = clutter_actor_get_width (actor); diff --git a/tests/interactive/test-shader.c b/tests/interactive/test-shader.c index 44ab581..14eb69f 100644 --- a/tests/interactive/test-shader.c +++ b/tests/interactive/test-shader.c @@ -36,8 +36,7 @@ typedef struct * correctly). */ #define FRAGMENT_SHADER_END \ - " gl_FragColor = color;" \ - " gl_FragColor = gl_FragColor * cogl_color_in;" \ + " cogl_color_out = color * cogl_color_in;" \ "}" static ShaderSource shaders[]=