From 6f4b45e296a3d548e09f13d8a96ab59bb030c8a6 Mon Sep 17 00:00:00 2001 From: Carsten Haitzler Date: Thu, 22 Oct 2009 08:55:07 +0000 Subject: [PATCH] re-enable yuv shader for 6410. SVN revision: 43195 --- .../evas/src/modules/engines/gl_common/evas_gl_context.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/legacy/evas/src/modules/engines/gl_common/evas_gl_context.c b/legacy/evas/src/modules/engines/gl_common/evas_gl_context.c index ca7f6c0..2586df1 100644 --- a/legacy/evas/src/modules/engines/gl_common/evas_gl_context.c +++ b/legacy/evas/src/modules/engines/gl_common/evas_gl_context.c @@ -176,12 +176,12 @@ evas_gl_common_context_new(void) &(shader_font_vert_src), &(shader_font_frag_src), "font"); -#if defined (GLES_VARIETY_S3C6410) - evas_gl_common_shader_program_init(&(shared->shader.yuv), - &(shader_img_vert_src), - &(shader_img_frag_src), - "yuv"); -#else +//#if defined (GLES_VARIETY_S3C6410) +// evas_gl_common_shader_program_init(&(shared->shader.yuv), +// &(shader_img_vert_src), +// &(shader_img_frag_src), +// "yuv"); +//#else evas_gl_common_shader_program_init(&(shared->shader.yuv), &(shader_yuv_vert_src), &(shader_yuv_frag_src), @@ -190,7 +190,7 @@ evas_gl_common_context_new(void) glUniform1i(glGetUniformLocation(shared->shader.yuv.prog, "tex"), 0); glUniform1i(glGetUniformLocation(shared->shader.yuv.prog, "texu"), 1); glUniform1i(glGetUniformLocation(shared->shader.yuv.prog, "texv"), 2); -#endif +//#endif // in shader: // uniform sampler2D tex[8]; // -- 2.7.4