jpeg pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=90b07fc42a4b76c1a2cacf07fbf2c74ba1e644f3
commit 90b07fc42a4b76c1a2cacf07fbf2c74ba1e644f3 Author: Jean-Philippe Andre <[email protected]> Date: Thu Sep 4 11:41:27 2014 +0900 Evas GL: Fix rotation angle get to check for DR first direct_enabled() is not visible from the engines... but it is from evas_gl_core which calls the engine. --- src/modules/evas/engines/gl_generic/evas_engine.c | 1 + src/modules/evas/engines/gl_x11/evas_engine.c | 6 +----- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/modules/evas/engines/gl_generic/evas_engine.c b/src/modules/evas/engines/gl_generic/evas_engine.c index 37dc5eb..f678870 100644 --- a/src/modules/evas/engines/gl_generic/evas_engine.c +++ b/src/modules/evas/engines/gl_generic/evas_engine.c @@ -1186,6 +1186,7 @@ static int eng_gl_rotation_angle_get(void *data) { if (!evgl_engine->funcs->rotation_angle_get) return 0; + if (!_evgl_direct_enabled()) return 0; return evgl_engine->funcs->rotation_angle_get(data); } diff --git a/src/modules/evas/engines/gl_x11/evas_engine.c b/src/modules/evas/engines/gl_x11/evas_engine.c index 877cf17..496a25e 100644 --- a/src/modules/evas/engines/gl_x11/evas_engine.c +++ b/src/modules/evas/engines/gl_x11/evas_engine.c @@ -598,11 +598,7 @@ evgl_eng_rotation_angle_get(void *data) } if ((eng_get_ob(re)) && (eng_get_ob(re)->gl_context)) - { - if (_evgl_direct_enabled()) - return eng_get_ob(re)->gl_context->rot; - return 0; - } + return eng_get_ob(re)->gl_context->rot; else { ERR("Unable to retrieve rotation angle."); --
