enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 3 Projects Releases Wiki Activity

Evas masking: Fix rendering of masks into invalid surfaces (GL) 

In some rare cases, a mask would be rendered (from mask_subrender)
into a surface that is NOT an FBO. This would happen because the
previous surface was a "scaled GL image" and its size would
match the required geometry.

That took a while to figure out...
http://thecodinglove.com/post/111546429281/when-i-finally-solve-a-nasty-bug
This commit is contained in:
Jean-Philippe Andre 2015-03-12 11:28:02 +09:00
parent 9abc0ee76f
commit 29be7a36c7
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/lib/evas/canvas/evas_render.c
View File

@ -1854,6 +1854,7 @@ evas_render_mask_subrender(Evas_Public_Data *evas,
mdata->w = w;
mdata->h = h;
mdata->is_alpha = (ENFN->image_colorspace_get(ENDT, scaled) == EVAS_COLORSPACE_GRY8);
mdata->is_scaled = EINA_TRUE;
}
}
}
@ -1862,7 +1863,7 @@ evas_render_mask_subrender(Evas_Public_Data *evas,
{
/* delete render surface if changed or if already alpha
* (we don't know how to render objects to alpha) */
if (mdata->surface && ((w != mdata->w) || (h != mdata->h) || mdata->is_alpha))
if (mdata->surface && ((w != mdata->w) || (h != mdata->h) || mdata->is_alpha || mdata->is_scaled))
{
ENFN->image_map_surface_free(ENDT, mdata->surface);
mdata->surface = NULL;
@ -1874,6 +1875,7 @@ evas_render_mask_subrender(Evas_Public_Data *evas,
mdata->surface = ENFN->image_map_surface_new(ENDT, w, h, EINA_TRUE);
if (!mdata->surface) goto end;
mdata->is_alpha = EINA_FALSE;
mdata->is_scaled = EINA_FALSE;
mdata->w = w;
mdata->h = h;
}

1
src/lib/evas/include/evas_private.h
View File

@ -915,6 +915,7 @@ struct _Evas_Object_Mask_Data
Eina_Bool is_mask : 1;
Eina_Bool redraw : 1;
Eina_Bool is_alpha : 1;
Eina_Bool is_scaled : 1;
};
struct _Evas_Object_Protected_State