for now - disable scissors.. seems to b0rk thungs

SVN revision: 44838
This commit is contained in:
Carsten Haitzler 2010-01-01 07:51:18 +00:00
parent fe0b8b4b36
commit 89bbb2c031
2 changed files with 10 additions and 1 deletions

View File

@ -990,6 +990,14 @@ evas_render_updates_internal(Evas *e,
{
evas_object_clip_recalc(obj);
}
/* hmmmm clip seems to kill eweather in elm-test
printf("clip: %4i %4i %4ix%4i to %4i %4i %4ix%4i\n",
x, y, w, h,
obj->cur.cache.clip.x + off_x,
obj->cur.cache.clip.y + off_y,
obj->cur.cache.clip.w,
obj->cur.cache.clip.h);
*/
RECTS_CLIP_TO_RECT(x, y, w, h,
obj->cur.cache.clip.x + off_x,
obj->cur.cache.clip.y + off_y,

View File

@ -863,6 +863,7 @@ shader_array_flush(Evas_GL_Context *gc)
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
}
}
/* hmmm this breaks things. must find out why!
if (gc->shader.clip != gc->shader.current.clip)
{
if (gc->shader.clip)
@ -891,7 +892,7 @@ shader_array_flush(Evas_GL_Context *gc)
// gc->clip.h);
}
*/
glVertexAttribPointer(SHAD_VERTEX, 3, GL_SHORT, GL_FALSE, 0, gc->array.vertex);
glVertexAttribPointer(SHAD_COLOR, 4, GL_UNSIGNED_BYTE, GL_TRUE, 0, gc->array.color);
glVertexAttribPointer(SHAD_TEXUV, 2, GL_FLOAT, GL_FALSE, 0, gc->array.texuv);