From 4f4a9048161421db6e9d54f0cbe289fd19469c6b Mon Sep 17 00:00:00 2001 From: Sung Park Date: Mon, 30 Jan 2012 11:21:38 +0000 Subject: [PATCH] Fixing my silly mistake before someone else catches it. I was accessing a variable before it was NULL checked. Fixed now. SVN revision: 67601 --- legacy/evas/src/modules/engines/gl_x11/evas_engine.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/legacy/evas/src/modules/engines/gl_x11/evas_engine.c b/legacy/evas/src/modules/engines/gl_x11/evas_engine.c index 589b242..5edbb19 100644 --- a/legacy/evas/src/modules/engines/gl_x11/evas_engine.c +++ b/legacy/evas/src/modules/engines/gl_x11/evas_engine.c @@ -3286,16 +3286,6 @@ eng_gl_make_current(void *data __UNUSED__, void *surface, void *context) sfc = (Render_Engine_GL_Surface*)surface; ctx = (Render_Engine_GL_Context*)context; - // Check if direct rendering is possible: - // It's possible when direct_fb_opt is on and either current image - // object is valid or gl_direct_override is on. Override allows - // rendering outside of pixel getter but it doesn't guarantee - // correct rendering. - if ((sfc->direct_fb_opt) && (gl_direct_img_obj || gl_direct_override)) - gl_direct_enabled = 1; - else - gl_direct_enabled = 0; - // Unset surface/context if ((!sfc) || (!ctx)) { @@ -3317,6 +3307,16 @@ eng_gl_make_current(void *data __UNUSED__, void *surface, void *context) return 1; } + // Check if direct rendering is possible: + // It's possible when direct_fb_opt is on and either current image + // object is valid or gl_direct_override is on. Override allows + // rendering outside of pixel getter but it doesn't guarantee + // correct rendering. + if ((sfc->direct_fb_opt) && (gl_direct_img_obj || gl_direct_override)) + gl_direct_enabled = 1; + else + gl_direct_enabled = 0; + if (gl_direct_enabled) { // Do a make current only if it's not already current -- 2.7.4