enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 3 Projects Releases Wiki Activity

fix gl engine make current impl (for ne evas gl stuff so no chlog 

needed)  to handle make current return value right



SVN revision: 59834
This commit is contained in:
Carsten Haitzler 2011-05-31 07:10:37 +00:00
parent dbd6c4cd1e
commit 3fa85660f8
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2560,22 +2560,18 @@ eng_gl_make_current(void *data, void *surface, void *context)
ERR("xxxMakeCurrent() failed!");
return 0;
}
return ret;
}
// Don't do a make current if it's already current
ret = 1;
#if defined (GLES_VARIETY_S3C6410) || defined (GLES_VARIETY_SGX)
if ((eglGetCurrentContext() != ctx->context))
{
ret = eglMakeCurrent(re->win->egl_disp, re->win->egl_surface[0],
re->win->egl_surface[0], ctx->context);
}
ret = eglMakeCurrent(re->win->egl_disp, re->win->egl_surface[0],
re->win->egl_surface[0], ctx->context);
#else
if (glXGetCurrentContext() != ctx->context)
{
ret = glXMakeCurrent(re->info->info.display, re->win->win, ctx->context);
}
ret = glXMakeCurrent(re->info->info.display, re->win->win, ctx->context);
#endif
if (!ret)
{
@ -2591,7 +2587,7 @@ eng_gl_make_current(void *data, void *surface, void *context)
}
// Attach FBO if it hasn't been attached or if surface changed
if ( (!sfc->fbo_attached) || (ctx != sfc->current_ctx))
if ((!sfc->fbo_attached) || (ctx != sfc->current_ctx))
{
if (!_attach_fbo_surface(re, sfc, ctx))
{