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

fixme notice, fix make current context to force if it was changed. 

SVN revision: 58375
This commit is contained in:
Carsten Haitzler 2011-04-06 05:56:53 +00:00
parent 99e32eebaa
commit 5c994667c2
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
legacy/evas/src/modules/engines/gl_common/evas_gl_context.c
View File

@ -2741,6 +2741,7 @@ shader_array_flush(Evas_Engine_GL_Context *gc)
cy = gh - gc->pipe[i].shader.cy - gc->pipe[i].shader.ch;
if (fbo) cy = gc->pipe[i].shader.cy;
glEnable(GL_SCISSOR_TEST);
// FIXME: handle gc->rot IF gc->pipe[0].shader.surface == gc->def_surface
glScissor(gc->pipe[i].shader.cx, cy,
gc->pipe[i].shader.cw, gc->pipe[i].shader.ch);
setclip = 1;
@ -2760,6 +2761,7 @@ shader_array_flush(Evas_Engine_GL_Context *gc)
{
cy = gh - gc->pipe[i].shader.cy - gc->pipe[i].shader.ch;
if (fbo) cy = gc->pipe[i].shader.cy;
// FIXME: handle gc->rot IF gc->pipe[0].shader.surface == gc->def_surface
glScissor(gc->pipe[i].shader.cx, cy,
gc->pipe[i].shader.cw, gc->pipe[i].shader.ch);
}

7
legacy/evas/src/modules/engines/gl_x11/evas_x_main.c
View File

@ -570,7 +570,12 @@ eng_window_use(Evas_GL_X11_Window *gw)
_evas_gl_x11_window->egl_surface[0]))
force_use = EINA_TRUE;
}
#else
#else
if (_evas_gl_x11_window)
{
if (glXGetCurrentContext() != _evas_gl_x11_window->context)
force_use = EINA_TRUE;
}
#endif
if ((_evas_gl_x11_window != gw) || (force_use))
{