diff options
author | Derek Foreman <derekf@osg.samsung.com> | 2017-11-08 10:37:06 -0600 |
---|---|---|
committer | Derek Foreman <derekf@osg.samsung.com> | 2017-11-08 15:12:51 -0600 |
commit | 73bddb4471235de4bc61cd44117a2963e5af1620 (patch) | |
tree | c70c2cc817ac667a468591b068ec403d5b9bf9dc | |
parent | c54a12aca60f169a7f2a8536d9a5c4cd71bb86b7 (diff) | |
download | efl-73bddb4471235de4bc61cd44117a2963e5af1620.tar.gz |
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.
-rw-r--r-- | src/modules/evas/engines/wayland_shm/evas_dmabuf.c | 7 | ||||
-rw-r--r-- | 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 * |