raster pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=23f5a5092cdb8fff0efada89dfeadf1deceef3b9

commit 23f5a5092cdb8fff0efada89dfeadf1deceef3b9
Author: Carsten Haitzler (Rasterman) <ras...@rasterman.com>
Date:   Tue Oct 13 19:43:18 2015 +0900

    Revert "Revert "Revert "evas: fix borked rotation support in GL engine."""
    
    This reverts commit f51168f4ec7a1bd3072428c7a271ad7c6715fde5.
    
    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.
    
    :)
---
 src/modules/evas/engines/gl_common/evas_gl_context.c | 11 +++++++----
 1 file changed, 7 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 dbfdc55..bb0a754 100644
--- a/src/modules/evas/engines/gl_common/evas_gl_context.c
+++ b/src/modules/evas/engines/gl_common/evas_gl_context.c
@@ -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);
 }

-- 


Reply via email to