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

evas-wayland-egl: Fix wayland egl engine not rendering 

Reset the Outbuf's Engine information pointer.
We also don't need to do an eng_window_free during reconfigure because the
software_generic_update function will free it anyway.
We should also re-setup the tilebuffer during eng_setup.
Fix gl_context resize to work even if there is no wl_egl window setup
yet.

@fix

Signed-off-by: Chris Michael <cp.michael@samsung.com>
This commit is contained in:
Chris Michael 2014-08-18 16:11:15 -04:00
parent 958a14e416
commit b44a068b4b
1 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/modules/evas/engines/wayland_egl/evas_engine.c
View File

@ -666,6 +666,7 @@ eng_setup(Evas *evas, void *info)
ob = eng_get_ob(re);
if ((ob) && (_re_wincheck(ob)))
{
ob->info = inf;
if ((ob->info->info.display != ob->disp) ||
(ob->info->info.surface != ob->surface) ||
(ob->info->info.win != ob->win) ||
@ -678,9 +679,6 @@ eng_setup(Evas *evas, void *info)
ob = eng_window_new(evas, inf, epd->output.w, epd->output.h, swap_mode);
if (!ob) goto ob_err;
eng_window_free(eng_get_ob(re));
re->generic.software.ob = NULL;
eng_window_use(ob);
@ -694,13 +692,6 @@ eng_setup(Evas *evas, void *info)
{
eng_outbuf_reconfigure(ob, epd->output.w, epd->output.h,
ob->info->info.rotation, 0);
if (re->generic.software.tb)
evas_common_tilebuf_free(re->generic.software.tb);
re->generic.software.tb =
evas_common_tilebuf_new(epd->output.w, epd->output.h);
if (re->generic.software.tb)
evas_common_tilebuf_set_tile_size(re->generic.software.tb,
TILESIZE, TILESIZE);
}
}
}
@ -717,8 +708,15 @@ eng_setup(Evas *evas, void *info)
goto ob_err;
}
if (re->generic.software.tb)
evas_common_tilebuf_free(re->generic.software.tb);
re->generic.software.tb =
evas_common_tilebuf_new(epd->output.w, epd->output.h);
if (re->generic.software.tb)
{
evas_common_tilebuf_set_tile_size(re->generic.software.tb,
TILESIZE, TILESIZE);
evas_render_engine_software_generic_tile_strict_set
(&re->generic.software, EINA_TRUE);
}
@ -816,10 +814,10 @@ eng_output_resize(void *data, int w, int h)
wl_egl_window_resize(ob->win, h, w, dx, dy);
else
wl_egl_window_resize(ob->win, w, h, dx, dy);
glsym_evas_gl_common_context_resize(ob->gl_context, w, h, ob->rot);
}
glsym_evas_gl_common_context_resize(ob->gl_context, w, h, ob->rot);
if (re->generic.software.tb)
evas_common_tilebuf_free(re->generic.software.tb);