derekf pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=73bddb4471235de4bc61cd44117a2963e5af1620
commit 73bddb4471235de4bc61cd44117a2963e5af1620
Author: Derek Foreman <der...@osg.samsung.com>
Date: Wed Nov 8 10:37:06 2017 -0600
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.
---
src/modules/evas/engines/wayland_shm/evas_dmabuf.c | 7 +++++--
src/modules/evas/engines/wayland_shm/evas_outbuf.c | 7 +------
2 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/src/modules/evas/engines/wayland_shm/evas_dmabuf.c
b/src/modules/evas/engines/wayland_shm/evas_dmabuf.c
index 9947cb5e51..de1c3fc124 100644
--- a/src/modules/evas/engines/wayland_shm/evas_dmabuf.c
+++ b/src/modules/evas/engines/wayland_shm/evas_dmabuf.c
@@ -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;
diff --git a/src/modules/evas/engines/wayland_shm/evas_outbuf.c
b/src/modules/evas/engines/wayland_shm/evas_outbuf.c
index d5a6b7e2bc..c962e37905 100644
--- a/src/modules/evas/engines/wayland_shm/evas_outbuf.c
+++ b/src/modules/evas/engines/wayland_shm/evas_outbuf.c
@@ -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 *
--
