summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCedric BAIL <cedric.bail@free.fr>2012-10-11 08:27:46 +0000
committerCedric BAIL <cedric.bail@free.fr>2012-10-11 08:27:46 +0000
commitdf36a0cd3b2548bd146304069e228a950d7d69d3 (patch)
tree9f020c0dd8c0de45b1c63658238e01ed106a37ea
parent371b00dae2d8254fb1e9a59f55d6b27fbe3a5b23 (diff)
evas: Fix texture size issues when the image has nv12 format
Patch from Sohyun Kim <anna1014.kim@samsung.com>. SVN revision: 77854
-rw-r--r--legacy/evas/AUTHORS1
-rw-r--r--legacy/evas/ChangeLog5
-rw-r--r--legacy/evas/NEWS1
-rw-r--r--legacy/evas/src/modules/engines/gl_common/evas_gl_texture.c2
-rw-r--r--legacy/evas/src/modules/engines/gl_common/shader/nv12_nomul_vert.h2
-rw-r--r--legacy/evas/src/modules/engines/gl_common/shader/nv12_nomul_vert.shd2
-rw-r--r--legacy/evas/src/modules/engines/gl_common/shader/nv12_vert.h2
-rw-r--r--legacy/evas/src/modules/engines/gl_common/shader/nv12_vert.shd2
8 files changed, 12 insertions, 5 deletions
diff --git a/legacy/evas/AUTHORS b/legacy/evas/AUTHORS
index f8c2a51874..851c24f888 100644
--- a/legacy/evas/AUTHORS
+++ b/legacy/evas/AUTHORS
@@ -38,3 +38,4 @@ Rafael Antognolli <antognolli@profusion.mobi>
38Daniel Zaoui <daniel.zaoui@samsung.com> 38Daniel Zaoui <daniel.zaoui@samsung.com>
39Christophe Sadoine <chris@indefini.org> 39Christophe Sadoine <chris@indefini.org>
40Igor Murzov <e-mail@date.by> 40Igor Murzov <e-mail@date.by>
41Sohyun Kim <anna1014.kim@samsung.com>
diff --git a/legacy/evas/ChangeLog b/legacy/evas/ChangeLog
index 83c997651e..b19eab6c0a 100644
--- a/legacy/evas/ChangeLog
+++ b/legacy/evas/ChangeLog
@@ -1091,3 +1091,8 @@
1091 * Fix font sizing issues when size scaling happens to down down 1091 * Fix font sizing issues when size scaling happens to down down
1092 when it should round up. happens in rare sizing situations and fonts. 1092 when it should round up. happens in rare sizing situations and fonts.
1093 1093
10942012-10-11 Sohyun Kim
1095
1096 * Fix texture size issues when the image has nv12 format
1097
1098
diff --git a/legacy/evas/NEWS b/legacy/evas/NEWS
index b0ac447717..52a1f45e39 100644
--- a/legacy/evas/NEWS
+++ b/legacy/evas/NEWS
@@ -215,6 +215,7 @@ Fixes:
215 * evas_object_image_data_convert 215 * evas_object_image_data_convert
216 * TGA loader detects false positives less and handles alpha TGAs better 216 * TGA loader detects false positives less and handles alpha TGAs better
217 * repeat event flag not inherited from parent smart like pass events 217 * repeat event flag not inherited from parent smart like pass events
218 * texture size for nv12 format
218 219
219Improvements: 220Improvements:
220 221
diff --git a/legacy/evas/src/modules/engines/gl_common/evas_gl_texture.c b/legacy/evas/src/modules/engines/gl_common/evas_gl_texture.c
index d4bb4c771b..b19191a89a 100644
--- a/legacy/evas/src/modules/engines/gl_common/evas_gl_texture.c
+++ b/legacy/evas/src/modules/engines/gl_common/evas_gl_texture.c
@@ -1512,7 +1512,7 @@ evas_gl_common_texture_nv12tiled_update(Evas_GL_Texture *tex, DATA8 **rows, unsi
1512 mb_h = (mb_h / 32 + (mb_h % 32 ? 1 : 0)); 1512 mb_h = (mb_h / 32 + (mb_h % 32 ? 1 : 0));
1513 1513
1514 mb_w = w / 2; 1514 mb_w = w / 2;
1515 mb_w = (mb_w / 32 + (mb_w % 32 ? 1 : 0)); 1515 mb_w = (mb_w / 64 + (mb_w % 64 ? 1 : 0));
1516 1516
1517 for (mb_y = 0; mb_y < (mb_h >> 1); mb_y++) 1517 for (mb_y = 0; mb_y < (mb_h >> 1); mb_y++)
1518 { 1518 {
diff --git a/legacy/evas/src/modules/engines/gl_common/shader/nv12_nomul_vert.h b/legacy/evas/src/modules/engines/gl_common/shader/nv12_nomul_vert.h
index 6ff1040ff3..8ad060f74a 100644
--- a/legacy/evas/src/modules/engines/gl_common/shader/nv12_nomul_vert.h
+++ b/legacy/evas/src/modules/engines/gl_common/shader/nv12_nomul_vert.h
@@ -10,5 +10,5 @@
10"{\n" 10"{\n"
11" gl_Position = mvp * vertex;\n" 11" gl_Position = mvp * vertex;\n"
12" tex_c = tex_coord;\n" 12" tex_c = tex_coord;\n"
13" tex_cuv = tex_coord2 * 0.25;\n" 13" tex_cuv = tex_coord2 * 0.5;\n"
14"}\n" 14"}\n"
diff --git a/legacy/evas/src/modules/engines/gl_common/shader/nv12_nomul_vert.shd b/legacy/evas/src/modules/engines/gl_common/shader/nv12_nomul_vert.shd
index 994f5e6b5d..ddd0d6e4a0 100644
--- a/legacy/evas/src/modules/engines/gl_common/shader/nv12_nomul_vert.shd
+++ b/legacy/evas/src/modules/engines/gl_common/shader/nv12_nomul_vert.shd
@@ -10,5 +10,5 @@ void main()
10{ 10{
11 gl_Position = mvp * vertex; 11 gl_Position = mvp * vertex;
12 tex_c = tex_coord; 12 tex_c = tex_coord;
13 tex_cuv = tex_coord2 * 0.25; 13 tex_cuv = tex_coord2 * 0.5;
14} 14}
diff --git a/legacy/evas/src/modules/engines/gl_common/shader/nv12_vert.h b/legacy/evas/src/modules/engines/gl_common/shader/nv12_vert.h
index 38d6d9ecdd..669f181f76 100644
--- a/legacy/evas/src/modules/engines/gl_common/shader/nv12_vert.h
+++ b/legacy/evas/src/modules/engines/gl_common/shader/nv12_vert.h
@@ -12,5 +12,5 @@
12" gl_Position = mvp * vertex;\n" 12" gl_Position = mvp * vertex;\n"
13" col = color;\n" 13" col = color;\n"
14" tex_c = tex_coord;\n" 14" tex_c = tex_coord;\n"
15" tex_cuv = tex_coord2 * 0.25;\n" 15" tex_cuv = tex_coord2 * 0.5;\n"
16"}\n" 16"}\n"
diff --git a/legacy/evas/src/modules/engines/gl_common/shader/nv12_vert.shd b/legacy/evas/src/modules/engines/gl_common/shader/nv12_vert.shd
index eb7cc3660e..ee9238c928 100644
--- a/legacy/evas/src/modules/engines/gl_common/shader/nv12_vert.shd
+++ b/legacy/evas/src/modules/engines/gl_common/shader/nv12_vert.shd
@@ -12,5 +12,5 @@ void main()
12 gl_Position = mvp * vertex; 12 gl_Position = mvp * vertex;
13 col = color; 13 col = color;
14 tex_c = tex_coord; 14 tex_c = tex_coord;
15 tex_cuv = tex_coord2 * 0.25; 15 tex_cuv = tex_coord2 * 0.5;
16} 16}