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

wayland_shm: Make EVAS_WAYLAND_SHM_DISABLE_DMABUF use new code 

Use the new wl_shm allocation functions making the old wl_shm code
unreachable even with the use of the disable env var.
This commit is contained in:
Derek Foreman 2017-11-08 10:37:06 -06:00
parent c54a12aca6
commit 73bddb4471
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/modules/evas/engines/wayland_shm/evas_dmabuf.c
View File

@ -423,8 +423,11 @@ _buffer_manager_get(void)
fd = open("/dev/dri/renderD128", O_RDWR | O_CLOEXEC);
if (fd < 0) goto err_drm;
success = _intel_buffer_manager_setup(fd);
if (!success) success = _exynos_buffer_manager_setup(fd);
if (!getenv("EVAS_WAYLAND_SHM_DISABLE_DMABUF"))
{
success = _intel_buffer_manager_setup(fd);
if (!success) success = _exynos_buffer_manager_setup(fd);
}
if (!success) success = _wl_shm_buffer_manager_setup(fd);
if (!success) goto err_bm;

7
src/modules/evas/engines/wayland_shm/evas_outbuf.c
View File

@ -12,12 +12,7 @@
Eina_Bool
_evas_surface_init(Surface *s, int w, int h, int num_buf)
{
if (!getenv("EVAS_WAYLAND_SHM_DISABLE_DMABUF"))
if (_evas_dmabuf_surface_create(s, w, h, num_buf)) return EINA_TRUE;
if (_evas_shm_surface_create(s, w, h, num_buf)) return EINA_TRUE;
return EINA_FALSE;
return _evas_dmabuf_surface_create(s, w, h, num_buf);
}
static Surface *