From 11bbc9e1aa3621851f9b369c6edcf6ac8f1e1ccc Mon Sep 17 00:00:00 2001 From: cedric Date: Mon, 5 Sep 2011 15:21:23 +0000 Subject: [PATCH] evas: fix alignment issue. git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/evas@63202 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- src/modules/engines/gl_common/evas_gl_texture.c | 4 ++-- src/modules/engines/gl_common/shader/nv12_frag.h | 2 +- src/modules/engines/gl_common/shader/nv12_nomul_frag.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/modules/engines/gl_common/evas_gl_texture.c b/src/modules/engines/gl_common/evas_gl_texture.c index 8f053c1..559f981 100644 --- a/src/modules/engines/gl_common/evas_gl_texture.c +++ b/src/modules/engines/gl_common/evas_gl_texture.c @@ -1141,7 +1141,7 @@ evas_gl_common_texture_nv12tiled_new(Evas_Engine_GL_Context *gc, DATA8 **rows, u { Evas_GL_Texture *tex; - tex = _evas_gl_common_texture_y2uv_new(gc, w, h, w / 2, h / 2, alpha_ifmt, alpha_fmt, lum_alpha_ifmt, lum_alpha_fmt); + tex = _evas_gl_common_texture_y2uv_new(gc, w, h, w, h, lum_ifmt, lum_fmt, lum_alpha_ifmt, lum_alpha_fmt); evas_gl_common_texture_nv12tiled_update(tex, rows, w, h); return tex; } @@ -1301,7 +1301,7 @@ evas_gl_common_texture_nv12tiled_update(Evas_GL_Texture *tex, DATA8 **rows, unsi glBindTexture(GL_TEXTURE_2D, tex->ptuv->texture); GLERR(__FUNCTION__, __FILE__, __LINE__, ""); - _tex_2d(tex->ptuv->intformat, w / 2, h / 2, tex->ptuv->format, tex->ptuv->dataformat); + _tex_2d(tex->ptuv->intformat, w, h, tex->ptuv->format, tex->ptuv->dataformat); /* Iterate each UV macroblock like we do in evas_convert_yuv.c */ base_h = (mb_h >> 1) + (mb_h & 0x1); diff --git a/src/modules/engines/gl_common/shader/nv12_frag.h b/src/modules/engines/gl_common/shader/nv12_frag.h index 2a13b87..7473cdf 100644 --- a/src/modules/engines/gl_common/shader/nv12_frag.h +++ b/src/modules/engines/gl_common/shader/nv12_frag.h @@ -7,7 +7,7 @@ "void main()\n" "{\n" " float y,u,v,vmu,r,g,b;\n" -" y=texture2D(tex,tex_c).a;\n" +" y=texture2D(tex,tex_c).g;\n" " u=texture2D(texuv,tex_cuv).g;\n" " v=texture2D(texuv,tex_cuv).a;\n" diff --git a/src/modules/engines/gl_common/shader/nv12_nomul_frag.h b/src/modules/engines/gl_common/shader/nv12_nomul_frag.h index e17c211..521c451 100644 --- a/src/modules/engines/gl_common/shader/nv12_nomul_frag.h +++ b/src/modules/engines/gl_common/shader/nv12_nomul_frag.h @@ -6,7 +6,7 @@ "void main()\n" "{\n" " float y,u,v,vmu,r,g,b;\n" -" y=texture2D(tex,tex_c).a;\n" +" y=texture2D(tex,tex_c).g;\n" " u=texture2D(texuv,tex_cuv).g;\n" " v=texture2D(texuv,tex_cuv).a;\n" -- 2.7.4