forked from enlightenment/efl
evas: fix borked rotation support in GL engine.
This bug was introduced by b0d2643f93
. I am
not sure I am not breaking that one instead now. Hopefully not.
This commit is contained in:
parent
ec909b4d6a
commit
6153471ac3
|
@ -2184,16 +2184,13 @@ evas_gl_common_context_image_push(Evas_Engine_GL_Context *gc,
|
|||
ox4 = sx;
|
||||
oy4 = sy + sh;
|
||||
|
||||
if ((tex->im) && (tex->im->native.data))
|
||||
if (tex->im)
|
||||
{
|
||||
if (tex->im->native.func.yinvert)
|
||||
if ((tex->im->native.func.yinvert) && (tex->im->native.data))
|
||||
yinvert = tex->im->native.func.yinvert(tex->im->native.func.data, tex->im);
|
||||
else
|
||||
yinvert = tex->im->native.yinvert;
|
||||
}
|
||||
|
||||
if ((tex->im) && (tex->im->native.data) && (!yinvert))
|
||||
{
|
||||
switch (tex->im->orient)
|
||||
{
|
||||
case EVAS_IMAGE_ORIENT_NONE:
|
||||
|
@ -2253,7 +2250,7 @@ evas_gl_common_context_image_push(Evas_Engine_GL_Context *gc,
|
|||
ty3 = ((double)(offsety) + oy3) / ph;
|
||||
tx4 = ((double)(offsetx) + ox4) / pw;
|
||||
ty4 = ((double)(offsety) + oy4) / ph;
|
||||
if ((tex->im) && (tex->im->native.data) && (!tex->im->native.yinvert))
|
||||
if ((tex->im) && (yinvert))
|
||||
{
|
||||
ty1 = 1.0 - ty1;
|
||||
ty2 = 1.0 - ty2;
|
||||
|
@ -2272,7 +2269,7 @@ evas_gl_common_context_image_push(Evas_Engine_GL_Context *gc,
|
|||
}
|
||||
|
||||
PUSH_MASK(pn, mtex, mx, my, mw, mh, masksam);
|
||||
|
||||
|
||||
if (!nomul)
|
||||
PUSH_6_COLORS(pn, r, g, b, a);
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue