From 99c3441068829bb45e6acb5ff7f08daa4a41e963 Mon Sep 17 00:00:00 2001 From: raster Date: Sat, 8 Oct 2011 03:04:16 +0000 Subject: [PATCH] fix cedric's nv12 shader! it worked by luck only. tex_y -> tex_c in vert shdr git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/evas@63918 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- src/modules/engines/gl_common/shader/nv12_nomul_vert.h | 4 ++-- src/modules/engines/gl_common/shader/nv12_nomul_vert.shd | 4 ++-- src/modules/engines/gl_common/shader/nv12_vert.h | 4 ++-- src/modules/engines/gl_common/shader/nv12_vert.shd | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/modules/engines/gl_common/shader/nv12_nomul_vert.h b/src/modules/engines/gl_common/shader/nv12_nomul_vert.h index 5dfbbdd..819ae51 100644 --- a/src/modules/engines/gl_common/shader/nv12_nomul_vert.h +++ b/src/modules/engines/gl_common/shader/nv12_nomul_vert.h @@ -9,10 +9,10 @@ "attribute vec4 color;\n" "attribute vec2 tex_coord, tex_coord2;\n" "uniform mat4 mvp;\n" -"varying vec2 tex_y, tex_cuv;\n" +"varying vec2 tex_c, tex_cuv;\n" "void main()\n" "{\n" " gl_Position = mvp * vertex;\n" -" tex_y = tex_coord;\n" +" tex_c = tex_coord;\n" " tex_cuv = tex_coord2 * 0.5;\n" "}\n" diff --git a/src/modules/engines/gl_common/shader/nv12_nomul_vert.shd b/src/modules/engines/gl_common/shader/nv12_nomul_vert.shd index de44b9d..77fe807 100644 --- a/src/modules/engines/gl_common/shader/nv12_nomul_vert.shd +++ b/src/modules/engines/gl_common/shader/nv12_nomul_vert.shd @@ -9,10 +9,10 @@ attribute vec4 vertex; attribute vec4 color; attribute vec2 tex_coord, tex_coord2; uniform mat4 mvp; -varying vec2 tex_y, tex_cuv; +varying vec2 tex_c, tex_cuv; void main() { gl_Position = mvp * vertex; - tex_y = tex_coord; + tex_c = tex_coord; tex_cuv = tex_coord2 * 0.5; } diff --git a/src/modules/engines/gl_common/shader/nv12_vert.h b/src/modules/engines/gl_common/shader/nv12_vert.h index d4f41c4..4574a46 100644 --- a/src/modules/engines/gl_common/shader/nv12_vert.h +++ b/src/modules/engines/gl_common/shader/nv12_vert.h @@ -10,11 +10,11 @@ "attribute vec2 tex_coord, tex_coord2;\n" "uniform mat4 mvp;\n" "varying vec4 col;\n" -"varying vec2 tex_y, tex_cuv;\n" +"varying vec2 tex_c, tex_cuv;\n" "void main()\n" "{\n" " gl_Position = mvp * vertex;\n" " col = color;\n" -" tex_y = tex_coord;\n" +" tex_c = tex_coord;\n" " tex_cuv = tex_coord2 * 0.5;\n" "}\n" diff --git a/src/modules/engines/gl_common/shader/nv12_vert.shd b/src/modules/engines/gl_common/shader/nv12_vert.shd index 558c3c7..d24ed73 100644 --- a/src/modules/engines/gl_common/shader/nv12_vert.shd +++ b/src/modules/engines/gl_common/shader/nv12_vert.shd @@ -10,11 +10,11 @@ attribute vec4 color; attribute vec2 tex_coord, tex_coord2; uniform mat4 mvp; varying vec4 col; -varying vec2 tex_y, tex_cuv; +varying vec2 tex_c, tex_cuv; void main() { gl_Position = mvp * vertex; col = color; - tex_y = tex_coord; + tex_c = tex_coord; tex_cuv = tex_coord2 * 0.5; } -- 2.7.4