jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=c0aa0b3410d40b1006ae75216afed060e6a5bed0
commit c0aa0b3410d40b1006ae75216afed060e6a5bed0
Author: Jean-Philippe Andre <jp.an...@samsung.com>
Date: Tue Apr 22 19:53:55 2014 +0900
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.
---
src/modules/evas/engines/gl_common/evas_gl_context.c | 8 ++++----
1 file 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,
}
else if (tex_only)
{
- if (tex->pt->dyn.img && (tex->pt->format != GL_ETC1_RGB8_OES))
+ if (tex->pt->dyn.img)
{
if ((smooth) && ((sw >= (w * 2)) && (sh >= (h * 2))))
{
@@ -1708,7 +1708,7 @@ evas_gl_common_context_image_push(Evas_Engine_GL_Context
*gc,
}
else
{
- if (tex->gc->shared->info.bgra && (tex->pt->format !=
GL_ETC1_RGB8_OES))
+ if (tex->gc->shared->info.bgra)
{
if ((smooth) && ((sw >= (w * 2)) && (sh >= (h * 2))))
{
@@ -2448,7 +2448,7 @@
evas_gl_common_context_image_map_push(Evas_Engine_GL_Context *gc,
default:
if (tex_only)
{
- if (tex->pt->dyn.img && (tex->pt->format != GL_ETC1_RGB8_OES))
+ if (tex->pt->dyn.img)
{
prog =
gc->shared->shader[evas_gl_common_shader_choice(npoints, p, r, g, b, a,
SHADER_IMG_BGRA_NOMUL, SHADER_IMG_BGRA)].prog;
@@ -2461,7 +2461,7 @@
evas_gl_common_context_image_map_push(Evas_Engine_GL_Context *gc,
}
else
{
- if (tex->gc->shared->info.bgra && (tex->pt->format !=
GL_ETC1_RGB8_OES))
+ if (tex->gc->shared->info.bgra)
{
prog =
gc->shared->shader[evas_gl_common_shader_choice(npoints, p, r, g, b, a,
SHADER_IMG_BGRA_NOMUL,
--
