forked from enlightenment/efl
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.
This commit is contained in:
parent
f21cfc0554
commit
c0aa0b3410
|
@ -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,
|
||||
|
|
Loading…
Reference in New Issue