summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2014-04-22 19:53:55 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2014-04-22 19:53:55 +0900
commitc0aa0b3410d40b1006ae75216afed060e6a5bed0 (patch)
treee508a73da1cf0e487c77af96b80ec8167403dff0
parentf21cfc0554820f6eccad780ddbf4958d28364b3b (diff)
Evas gl: Don't swap RGBA colors with ETC1
Since rg_etc1 now outputs proper BGRA data, the shaders should not swizzle the colors around. Stick to the normal fragment shaders. Note: This is not tested.
-rw-r--r--src/modules/evas/engines/gl_common/evas_gl_context.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/modules/evas/engines/gl_common/evas_gl_context.c b/src/modules/evas/engines/gl_common/evas_gl_context.c
index c7f0f99..7a0b215 100644
--- a/src/modules/evas/engines/gl_common/evas_gl_context.c
+++ b/src/modules/evas/engines/gl_common/evas_gl_context.c
@@ -1637,7 +1637,7 @@ evas_gl_common_context_image_push(Evas_Engine_GL_Context *gc,
1637 } 1637 }
1638 else if (tex_only) 1638 else if (tex_only)
1639 { 1639 {
1640 if (tex->pt->dyn.img && (tex->pt->format != GL_ETC1_RGB8_OES)) 1640 if (tex->pt->dyn.img)
1641 { 1641 {
1642 if ((smooth) && ((sw >= (w * 2)) && (sh >= (h * 2)))) 1642 if ((smooth) && ((sw >= (w * 2)) && (sh >= (h * 2))))
1643 { 1643 {
@@ -1708,7 +1708,7 @@ evas_gl_common_context_image_push(Evas_Engine_GL_Context *gc,
1708 } 1708 }
1709 else 1709 else
1710 { 1710 {
1711 if (tex->gc->shared->info.bgra && (tex->pt->format != GL_ETC1_RGB8_OES)) 1711 if (tex->gc->shared->info.bgra)
1712 { 1712 {
1713 if ((smooth) && ((sw >= (w * 2)) && (sh >= (h * 2)))) 1713 if ((smooth) && ((sw >= (w * 2)) && (sh >= (h * 2))))
1714 { 1714 {
@@ -2448,7 +2448,7 @@ evas_gl_common_context_image_map_push(Evas_Engine_GL_Context *gc,
2448 default: 2448 default:
2449 if (tex_only) 2449 if (tex_only)
2450 { 2450 {
2451 if (tex->pt->dyn.img && (tex->pt->format != GL_ETC1_RGB8_OES)) 2451 if (tex->pt->dyn.img)
2452 { 2452 {
2453 prog = gc->shared->shader[evas_gl_common_shader_choice(npoints, p, r, g, b, a, 2453 prog = gc->shared->shader[evas_gl_common_shader_choice(npoints, p, r, g, b, a,
2454 SHADER_IMG_BGRA_NOMUL, SHADER_IMG_BGRA)].prog; 2454 SHADER_IMG_BGRA_NOMUL, SHADER_IMG_BGRA)].prog;
@@ -2461,7 +2461,7 @@ evas_gl_common_context_image_map_push(Evas_Engine_GL_Context *gc,
2461 } 2461 }
2462 else 2462 else
2463 { 2463 {
2464 if (tex->gc->shared->info.bgra && (tex->pt->format != GL_ETC1_RGB8_OES)) 2464 if (tex->gc->shared->info.bgra)
2465 { 2465 {
2466 prog = gc->shared->shader[evas_gl_common_shader_choice(npoints, p, r, g, b, a, 2466 prog = gc->shared->shader[evas_gl_common_shader_choice(npoints, p, r, g, b, a,
2467 SHADER_IMG_BGRA_NOMUL, 2467 SHADER_IMG_BGRA_NOMUL,