NorwayFun
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixing my silly mistake before someone else catches it. 

I was accessing a variable before it was NULL checked. 
Fixed now.



SVN revision: 67601
This commit is contained in:
Sung Park 2012-01-30 11:21:38 +00:00
parent f6ff119e67
commit 4f4a904816
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
legacy/evas/src/modules/engines/gl_x11/evas_engine.c
View File

@ -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