From a68d55964ff925f68d1d8e86b46eda375b09ad17 Mon Sep 17 00:00:00 2001 From: sung Date: Wed, 25 Jan 2012 05:08:23 +0000 Subject: [PATCH] Fixed a logic error for Evas GL Direct rendering override option. It should have been OR instead of AND operator. When the image object alpha is on "OR" the rotation angle is not "0", direct rendering isn't allowed. However, allow direct rendering if EVAS_GL_DIRECT_OVERRIDE=1 is set. git-svn-id: http://svn.enlightenment.org/svn/e/trunk/evas@67521 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- src/modules/engines/gl_x11/evas_engine.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/engines/gl_x11/evas_engine.c b/src/modules/engines/gl_x11/evas_engine.c index 736858b..589b242 100644 --- a/src/modules/engines/gl_x11/evas_engine.c +++ b/src/modules/engines/gl_x11/evas_engine.c @@ -4123,7 +4123,7 @@ eng_gl_img_obj_set(void *data, void *image, int has_alpha) // Normally direct rendering isn't allowed if alpha is on and // rotation is not 0. BUT, if override is on, allow it. - if ((has_alpha) && (re->win->gl_context->rot!=0)) + if ((has_alpha) || (re->win->gl_context->rot!=0)) { if (gl_direct_override) gl_direct_img_obj = image; -- 2.7.4