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.

diff --git a/src/modules/evas/engines/wayland_shm/evas_dmabuf.c b/src/modules/evas/engines/wayland_shm/evas_dmabuf.c
index 9947cb5..de1c3fc 100644 (file)
--- 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 d5a6b7e..c962e37 100644 (file)
--- 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 *