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

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/modules/evas/engines/gl_common/evas_gl_context.c
View File

@ -2742,13 +2742,14 @@ shader_array_flush(Evas_Engine_GL_Context *gc)
ch = gc->master_clip.h; 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); glEnable(GL_SCISSOR_TEST);
if (!fbo) if (!fbo)
scissor_rot(gc, gc->rot, gw, gh, cx, gh - cy - ch, cw, ch); scissor_rot(gc, gc->rot, gw, gh, cx, gh - cy - ch, cw, ch);
else else
glScissor(cx, cy, cw, ch); glScissor(cx, cy, cw, ch);
setclip = 1; setclip = 1;
gc->state.current.cx = cx; gc->state.current.cx = cx;
gc->state.current.cy = cy; gc->state.current.cy = cy;
@ -2766,7 +2767,7 @@ shader_array_flush(Evas_Engine_GL_Context *gc)
} }
} }
if (((gc->pipe[i].shader.clip) && (!setclip)) || if (((gc->pipe[i].shader.clip) && (!setclip)) ||
(gc->master_clip.enabled)) ((gc->master_clip.enabled) && (!fbo)))
{ {
int cx, cy, cw, ch; int cx, cy, cw, ch;
@ -2796,9 +2797,9 @@ shader_array_flush(Evas_Engine_GL_Context *gc)
(ch != gc->state.current.ch)) (ch != gc->state.current.ch))
{ {
if (!fbo) if (!fbo)
scissor_rot(gc, gc->rot, gw, gh, cx, gh - cy - ch, cw, ch); scissor_rot(gc, gc->rot, gw, gh, cx, gh - cy - ch, cw, ch);
else else
glScissor(cx, cy, cw, ch); glScissor(cx, cy, cw, ch);
gc->state.current.cx = cx; gc->state.current.cx = cx;
gc->state.current.cy = cy; gc->state.current.cy = cy;
gc->state.current.cw = cw; gc->state.current.cw = cw;