last scissor always scissor stuff broke map. fix it to work again

accounting for fbo's and master clip.
This commit is contained in:
Carsten Haitzler 2013-05-04 11:43:02 +09:00
parent b9836fbc07
commit d47a81ce17
1 changed files with 7 additions and 6 deletions

View File

@ -2742,7 +2742,8 @@ shader_array_flush(Evas_Engine_GL_Context *gc)
ch = gc->master_clip.h;
}
}
if ((gc->pipe[i].shader.clip) || (gc->master_clip.enabled))
if ((gc->pipe[i].shader.clip) ||
((gc->master_clip.enabled) && (!fbo)))
{
glEnable(GL_SCISSOR_TEST);
if (!fbo)
@ -2766,7 +2767,7 @@ shader_array_flush(Evas_Engine_GL_Context *gc)
}
}
if (((gc->pipe[i].shader.clip) && (!setclip)) ||
(gc->master_clip.enabled))
((gc->master_clip.enabled) && (!fbo)))
{
int cx, cy, cw, ch;