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

evas/gl_generic: Check for errors when calling tbm surface map/unmap 

tbm_surface_map/unmap might fail and return error, so we need to check
the return value of these APIs.
This commit is contained in:
Dongyeon Kim 2015-11-12 17:30:53 +09:00
parent 7db0e20661
commit 8c2f9a2669
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/modules/evas/engines/gl_generic/evas_engine.c
View File

@ -757,10 +757,15 @@ eng_image_data_get(void *data, void *image, int to_write, DATA32 **image_data, i
if ((im->gc->shared->info.sec_tbm_surface) && (secsym_tbm_surface_map)) if ((im->gc->shared->info.sec_tbm_surface) && (secsym_tbm_surface_map))
{ {
tbm_surface_info_s info; tbm_surface_info_s info;
secsym_tbm_surface_map(im->tex->pt->dyn.buffer, if (secsym_tbm_surface_map(im->tex->pt->dyn.buffer,
TBM_SURF_OPTION_READ|TBM_SURF_OPTION_WRITE, TBM_SURF_OPTION_READ|TBM_SURF_OPTION_WRITE,
&info); &info))
*image_data = im->tex->pt->dyn.data = (DATA32 *) info.planes[0].ptr; {
ERR("tbm_surface_map failed!");
*image_data = im->tex->pt->dyn.data = NULL;
}
else
*image_data = im->tex->pt->dyn.data = (DATA32 *) info.planes[0].ptr;
} }
else if ((im->gc->shared->info.sec_image_map) && (secsym_eglMapImageSEC)) else if ((im->gc->shared->info.sec_image_map) && (secsym_eglMapImageSEC))
{ {
@ -933,7 +938,10 @@ eng_image_data_put(void *data, void *image, DATA32 *image_data)
if (im->tex->pt->dyn.checked_out == 0) if (im->tex->pt->dyn.checked_out == 0)
{ {
if (im->gc->shared->info.sec_tbm_surface) if (im->gc->shared->info.sec_tbm_surface)
secsym_tbm_surface_unmap(im->tex->pt->dyn.buffer); {
if (secsym_tbm_surface_unmap(im->tex->pt->dyn.buffer))
ERR("tbm_surface_unmap failed!");
}
else if (im->gc->shared->info.sec_image_map) else if (im->gc->shared->info.sec_image_map)
{ {
void *disp = disp = re->window_egl_display_get(re->software.ob); void *disp = disp = re->window_egl_display_get(re->software.ob);