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

aaaah and map in map clip and more bug fixes... 

SVN revision: 52939
This commit is contained in:
Carsten Haitzler 2010-10-01 04:46:04 +00:00
parent 94bfb8fbe6
commit 5b45763676
1 changed files with 28 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1903,9 +1903,9 @@ evas_gl_common_context_image_map4_push(Evas_GL_Context *gc,
if ((p[0].z == p[1].z) && (p[1].z == p[2].z) && (p[2].z == p[3].z)) if ((p[0].z == p[1].z) && (p[1].z == p[2].z) && (p[2].z == p[3].z))
flat = 1; flat = 1;
// flat = 1;
if (!clip) cx = cy = cw = ch = 0; if (!clip) cx = cy = cw = ch = 0;
if (!flat) if (!flat)
{ {
if (p[0].foc <= 0) flat = 1; if (p[0].foc <= 0) flat = 1;
@ -1995,8 +1995,6 @@ evas_gl_common_context_image_map4_push(Evas_GL_Context *gc,
gc->py = p[0].py >> FP; gc->py = p[0].py >> FP;
gc->change.size = 1; gc->change.size = 1;
_evas_gl_common_viewport_set(gc); _evas_gl_common_viewport_set(gc);
cx += gc->shared->ax;
cy -= gc->shared->ay;
} }
again: again:
vertex_array_size_check(gc, gc->state.top_pipe, 6); vertex_array_size_check(gc, gc->state.top_pipe, 6);
@ -2276,9 +2274,7 @@ evas_gl_common_context_flush(Evas_GL_Context *gc)
static void static void
shader_array_flush(Evas_GL_Context *gc) shader_array_flush(Evas_GL_Context *gc)
{ {
int i, setclip; int i, gw, gh, setclip, cy, fbo = 0, done = 0;
int done = 0;
int gw, gh;
gw = gc->w; gw = gc->w;
gh = gc->h; gh = gc->h;
@ -2287,11 +2283,12 @@ shader_array_flush(Evas_GL_Context *gc)
{ {
gw = gc->pipe[0].shader.surface->w; gw = gc->pipe[0].shader.surface->w;
gh = gc->pipe[0].shader.surface->h; gh = gc->pipe[0].shader.surface->h;
fbo = 1;
} }
for (i = 0; i < gc->shared->info.tune.pipes.max; i++) for (i = 0; i < gc->shared->info.tune.pipes.max; i++)
{ {
if (gc->pipe[i].array.num <= 0) break; if (gc->pipe[i].array.num <= 0) break;
setclip = 0;
done++; done++;
gc->flushnum++; gc->flushnum++;
GLERR(__FUNCTION__, __FILE__, __LINE__, "<flush err>"); GLERR(__FUNCTION__, __FILE__, __LINE__, "<flush err>");
@ -2422,17 +2419,16 @@ shader_array_flush(Evas_GL_Context *gc)
GLERR(__FUNCTION__, __FILE__, __LINE__, ""); GLERR(__FUNCTION__, __FILE__, __LINE__, "");
} }
} }
#if 1
setclip = 0;
if (gc->pipe[i].shader.clip != gc->state.current.clip) if (gc->pipe[i].shader.clip != gc->state.current.clip)
{ {
if (gc->pipe[i].shader.clip) if (gc->pipe[i].shader.clip)
{ {
cy = gh - gc->pipe[i].shader.cy - gc->pipe[i].shader.ch;
if (fbo) cy = gc->pipe[i].shader.cy;
glEnable(GL_SCISSOR_TEST); glEnable(GL_SCISSOR_TEST);
glScissor(gc->pipe[i].shader.cx, glScissor(gc->pipe[i].shader.cx, cy,
gh - gc->pipe[i].shader.cy - gc->pipe[i].shader.ch, gc->pipe[i].shader.cw, gc->pipe[i].shader.ch);
gc->pipe[i].shader.cw,
gc->pipe[i].shader.ch);
setclip = 1; setclip = 1;
} }
else else
@ -2444,17 +2440,17 @@ shader_array_flush(Evas_GL_Context *gc)
if ((gc->pipe[i].shader.clip) && (!setclip)) if ((gc->pipe[i].shader.clip) && (!setclip))
{ {
if ((gc->pipe[i].shader.cx != gc->state.current.cx) || if ((gc->pipe[i].shader.cx != gc->state.current.cx) ||
(gc->pipe[i].shader.cx != gc->state.current.cx) || (gc->pipe[i].shader.cy != gc->state.current.cy) ||
(gc->pipe[i].shader.cx != gc->state.current.cx) || (gc->pipe[i].shader.cw != gc->state.current.cw) ||
(gc->pipe[i].shader.cx != gc->state.current.cx)) (gc->pipe[i].shader.ch != gc->state.current.ch))
{ {
glScissor(gc->pipe[i].shader.cx, cy = gh - gc->pipe[i].shader.cy - gc->pipe[i].shader.ch;
gh - gc->pipe[i].shader.cy - gc->pipe[i].shader.ch, if (fbo) cy = gc->pipe[i].shader.cy;
gc->pipe[i].shader.cw, glScissor(gc->pipe[i].shader.cx, cy,
gc->pipe[i].shader.ch); gc->pipe[i].shader.cw, gc->pipe[i].shader.ch);
} }
} }
#endif
glVertexAttribPointer(SHAD_VERTEX, 3, GL_SHORT, GL_FALSE, 0, gc->pipe[i].array.vertex); glVertexAttribPointer(SHAD_VERTEX, 3, GL_SHORT, GL_FALSE, 0, gc->pipe[i].array.vertex);
GLERR(__FUNCTION__, __FILE__, __LINE__, ""); GLERR(__FUNCTION__, __FILE__, __LINE__, "");
glVertexAttribPointer(SHAD_COLOR, 4, GL_UNSIGNED_BYTE, GL_TRUE, 0, gc->pipe[i].array.color); glVertexAttribPointer(SHAD_COLOR, 4, GL_UNSIGNED_BYTE, GL_TRUE, 0, gc->pipe[i].array.color);
@ -2524,7 +2520,8 @@ shader_array_flush(Evas_GL_Context *gc)
{ {
const char *types[6] = const char *types[6] =
{"----", "RECT", "IMAG", "FONT", "YUV-", "MAP"}; {"----", "RECT", "IMAG", "FONT", "YUV-", "MAP"};
printf(" DRAW %4i -> %p[%4ix%4i] @ %4ix%4i -{ tex %4i type %s }-\n", printf(" DRAW#%3i %4i -> %p[%4ix%4i] @ %4ix%4i -{ tex %4i type %s }-\n",
i,
gc->pipe[i].array.num / 6, gc->pipe[i].array.num / 6,
gc->pipe[0].shader.surface, gc->pipe[0].shader.surface,
gc->pipe[0].shader.surface->w, gc->pipe[0].shader.surface->w,