aboutsummaryrefslogtreecommitdiffstats
path: root/src/modules/evas
diff options
context:
space:
mode:
authorCedric BAIL <cedric@osg.samsung.com>2015-10-12 17:22:27 -0700
committerCedric BAIL <cedric@osg.samsung.com>2015-10-12 17:47:40 -0700
commitf51168f4ec7a1bd3072428c7a271ad7c6715fde5 (patch)
tree0290ba4b5f09da7cedce8016d678f4a4f3029288 /src/modules/evas
parentevas: correctly get GLX_Y_INVERTED_EXT. (diff)
downloadefl-f51168f4ec7a1bd3072428c7a271ad7c6715fde5.tar.gz
Revert "Revert "evas: fix borked rotation support in GL engine.""
This reverts commit 5bb1c52e3a075d3a69b5baee2f2ad8d2788655b0. This patch is actually correct, but it highlight a bug in how we retrieve GLX_Y_INVERTED_EXT value.
Diffstat (limited to 'src/modules/evas')
-rw-r--r--src/modules/evas/engines/gl_common/evas_gl_context.c11
1 files changed, 4 insertions, 7 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 bb0a754bf7..dbfdc55cb5 100644
--- a/src/modules/evas/engines/gl_common/evas_gl_context.c
+++ b/src/modules/evas/engines/gl_common/evas_gl_context.c
@@ -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);
}