forked from enlightenment/efl
fixme notice, fix make current context to force if it was changed.
SVN revision: 58375
This commit is contained in:
parent
99e32eebaa
commit
5c994667c2
|
@ -2741,6 +2741,7 @@ shader_array_flush(Evas_Engine_GL_Context *gc)
|
||||||
cy = gh - gc->pipe[i].shader.cy - gc->pipe[i].shader.ch;
|
cy = gh - gc->pipe[i].shader.cy - gc->pipe[i].shader.ch;
|
||||||
if (fbo) cy = gc->pipe[i].shader.cy;
|
if (fbo) cy = gc->pipe[i].shader.cy;
|
||||||
glEnable(GL_SCISSOR_TEST);
|
glEnable(GL_SCISSOR_TEST);
|
||||||
|
// FIXME: handle gc->rot IF gc->pipe[0].shader.surface == gc->def_surface
|
||||||
glScissor(gc->pipe[i].shader.cx, cy,
|
glScissor(gc->pipe[i].shader.cx, cy,
|
||||||
gc->pipe[i].shader.cw, gc->pipe[i].shader.ch);
|
gc->pipe[i].shader.cw, gc->pipe[i].shader.ch);
|
||||||
setclip = 1;
|
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;
|
cy = gh - gc->pipe[i].shader.cy - gc->pipe[i].shader.ch;
|
||||||
if (fbo) cy = gc->pipe[i].shader.cy;
|
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,
|
glScissor(gc->pipe[i].shader.cx, cy,
|
||||||
gc->pipe[i].shader.cw, gc->pipe[i].shader.ch);
|
gc->pipe[i].shader.cw, gc->pipe[i].shader.ch);
|
||||||
}
|
}
|
||||||
|
|
|
@ -570,7 +570,12 @@ eng_window_use(Evas_GL_X11_Window *gw)
|
||||||
_evas_gl_x11_window->egl_surface[0]))
|
_evas_gl_x11_window->egl_surface[0]))
|
||||||
force_use = EINA_TRUE;
|
force_use = EINA_TRUE;
|
||||||
}
|
}
|
||||||
#else
|
#else
|
||||||
|
if (_evas_gl_x11_window)
|
||||||
|
{
|
||||||
|
if (glXGetCurrentContext() != _evas_gl_x11_window->context)
|
||||||
|
force_use = EINA_TRUE;
|
||||||
|
}
|
||||||
#endif
|
#endif
|
||||||
if ((_evas_gl_x11_window != gw) || (force_use))
|
if ((_evas_gl_x11_window != gw) || (force_use))
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue