summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDerek Foreman <derekf@osg.samsung.com>2017-11-08 10:37:06 -0600
committerDerek Foreman <derekf@osg.samsung.com>2017-11-08 15:12:51 -0600
commit73bddb4471235de4bc61cd44117a2963e5af1620 (patch)
treec70c2cc817ac667a468591b068ec403d5b9bf9dc
parentc54a12aca60f169a7f2a8536d9a5c4cd71bb86b7 (diff)
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.c7
-rw-r--r--src/modules/evas/engines/wayland_shm/evas_outbuf.c7
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)
423 fd = open("/dev/dri/renderD128", O_RDWR | O_CLOEXEC); 423 fd = open("/dev/dri/renderD128", O_RDWR | O_CLOEXEC);
424 if (fd < 0) goto err_drm; 424 if (fd < 0) goto err_drm;
425 425
426 success = _intel_buffer_manager_setup(fd); 426 if (!getenv("EVAS_WAYLAND_SHM_DISABLE_DMABUF"))
427 if (!success) success = _exynos_buffer_manager_setup(fd); 427 {
428 success = _intel_buffer_manager_setup(fd);
429 if (!success) success = _exynos_buffer_manager_setup(fd);
430 }
428 if (!success) success = _wl_shm_buffer_manager_setup(fd); 431 if (!success) success = _wl_shm_buffer_manager_setup(fd);
429 if (!success) goto err_bm; 432 if (!success) goto err_bm;
430 433
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 @@
12Eina_Bool 12Eina_Bool
13_evas_surface_init(Surface *s, int w, int h, int num_buf) 13_evas_surface_init(Surface *s, int w, int h, int num_buf)
14{ 14{
15 if (!getenv("EVAS_WAYLAND_SHM_DISABLE_DMABUF")) 15 return _evas_dmabuf_surface_create(s, w, h, num_buf);
16 if (_evas_dmabuf_surface_create(s, w, h, num_buf)) return EINA_TRUE;
17
18 if (_evas_shm_surface_create(s, w, h, num_buf)) return EINA_TRUE;
19
20 return EINA_FALSE;
21} 16}
22 17
23static Surface * 18static Surface *