Revert "Revert "Revert "evas: fix borked rotation support in GL engine."""

This reverts commit f51168f4ec.

if this is right or not... this RESULTS in enlightenment becoming
totally unusable. put this back WHEN other issues are fixed you think
that exist. last i knew we query yinvert start with glx per native
surface and use that info - so as best i know it is and has been right
for a long time.

:)
This commit is contained in:
Carsten Haitzler 2015-10-13 19:43:18 +09:00
parent 16819d37d2
commit 23f5a5092c
1 changed files with 7 additions and 4 deletions

View File

@ -2184,13 +2184,16 @@ evas_gl_common_context_image_push(Evas_Engine_GL_Context *gc,
ox4 = sx;
oy4 = sy + sh;
if (tex->im)
if ((tex->im) && (tex->im->native.data))
{
if ((tex->im->native.func.yinvert) && (tex->im->native.data))
if (tex->im->native.func.yinvert)
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:
@ -2250,7 +2253,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) && (yinvert))
if ((tex->im) && (tex->im->native.data) && (!tex->im->native.yinvert))
{
ty1 = 1.0 - ty1;
ty2 = 1.0 - ty2;
@ -2269,7 +2272,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);
}