summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>2015-10-13 19:43:18 +0900
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2015-10-13 19:43:18 +0900
commit23f5a5092cdb8fff0efada89dfeadf1deceef3b9 (patch)
treeda7ae814c65c5e2f443133076ff3772fbe8ed8c3
parent16819d37d24bdfba2b6b9842d4198c1764382231 (diff)
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. :)
-rw-r--r--src/modules/evas/engines/gl_common/evas_gl_context.c11
1 files 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 dbfdc55cb5..bb0a754bf7 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,
2184 ox4 = sx; 2184 ox4 = sx;
2185 oy4 = sy + sh; 2185 oy4 = sy + sh;
2186 2186
2187 if (tex->im) 2187 if ((tex->im) && (tex->im->native.data))
2188 { 2188 {
2189 if ((tex->im->native.func.yinvert) && (tex->im->native.data)) 2189 if (tex->im->native.func.yinvert)
2190 yinvert = tex->im->native.func.yinvert(tex->im->native.func.data, tex->im); 2190 yinvert = tex->im->native.func.yinvert(tex->im->native.func.data, tex->im);
2191 else 2191 else
2192 yinvert = tex->im->native.yinvert; 2192 yinvert = tex->im->native.yinvert;
2193 }
2193 2194
2195 if ((tex->im) && (tex->im->native.data) && (!yinvert))
2196 {
2194 switch (tex->im->orient) 2197 switch (tex->im->orient)
2195 { 2198 {
2196 case EVAS_IMAGE_ORIENT_NONE: 2199 case EVAS_IMAGE_ORIENT_NONE:
@@ -2250,7 +2253,7 @@ evas_gl_common_context_image_push(Evas_Engine_GL_Context *gc,
2250 ty3 = ((double)(offsety) + oy3) / ph; 2253 ty3 = ((double)(offsety) + oy3) / ph;
2251 tx4 = ((double)(offsetx) + ox4) / pw; 2254 tx4 = ((double)(offsetx) + ox4) / pw;
2252 ty4 = ((double)(offsety) + oy4) / ph; 2255 ty4 = ((double)(offsety) + oy4) / ph;
2253 if ((tex->im) && (yinvert)) 2256 if ((tex->im) && (tex->im->native.data) && (!tex->im->native.yinvert))
2254 { 2257 {
2255 ty1 = 1.0 - ty1; 2258 ty1 = 1.0 - ty1;
2256 ty2 = 1.0 - ty2; 2259 ty2 = 1.0 - ty2;
@@ -2269,7 +2272,7 @@ evas_gl_common_context_image_push(Evas_Engine_GL_Context *gc,
2269 } 2272 }
2270 2273
2271 PUSH_MASK(pn, mtex, mx, my, mw, mh, masksam); 2274 PUSH_MASK(pn, mtex, mx, my, mw, mh, masksam);
2272 2275
2273 if (!nomul) 2276 if (!nomul)
2274 PUSH_6_COLORS(pn, r, g, b, a); 2277 PUSH_6_COLORS(pn, r, g, b, a);
2275} 2278}