wayland_shm: Remove old shm code

The new shm code should be equally capable - minus one surface resize
optimization that probably didn't buy us much performance at the cost
of memory.

2 files changed, 0 insertions, 600 deletions

diff --git a/src/Makefile_Evas.am b/src/Makefile_Evas.am
index e5c3dba46b..f1d0148667 100644
--- a/src/Makefile_Evas.am
+++ b/src/Makefile_Evas.am
@@ -1318,7 +1318,6 @@ WAYLAND_SHM_SOURCES = \
 modules/evas/engines/wayland_common/Evas_Engine_Wayland.h \
 modules/evas/engines/wayland_shm/evas_engine.c \
 modules/evas/engines/wayland_shm/evas_engine.h \
-modules/evas/engines/wayland_shm/evas_shm.c \
 modules/evas/engines/wayland_shm/evas_dmabuf.c \
 modules/evas/engines/wayland_shm/evas_outbuf.c \
 static_libs/libdrm/drm_fourcc.h \
diff --git a/src/modules/evas/engines/wayland_shm/evas_shm.c b/src/modules/evas/engines/wayland_shm/evas_shm.c
deleted file mode 100644
index a2ab42ccf3..0000000000
--- a/src/modules/evas/engines/wayland_shm/evas_shm.c
+++ /dev/null
@@ -1,599 +0,0 @@
-/* Portions of this code have been derived from Weston
- *
- * Copyright © 2008-2012 Kristian Høgsberg
- * Copyright © 2010-2012 Intel Corporation
- * Copyright © 2010-2011 Benjamin Franzke
- * Copyright © 2011-2012 Collabora, Ltd.
- * Copyright © 2010 Red Hat <mjg@redhat.com>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- */
-
-#include "evas_common_private.h"
-#include "evas_private.h"
-#include "evas_engine.h"
-#include <sys/mman.h>
-
-typedef struct _Shm_Pool Shm_Pool;
-struct _Shm_Pool
-{
-   struct wl_shm_pool *pool;
-   size_t size, used;
-   void *data;
-};
-
-typedef struct _Shm_Data Shm_Data;
-struct _Shm_Data
-{
-   struct wl_buffer *buffer;
-   Shm_Pool *pool;
-   void *map;
-};
-
-typedef struct _Shm_Leaf Shm_Leaf;
-struct _Shm_Leaf
-{
-   int w, h, busy, age;
-   Shm_Data *data;
-   Shm_Pool *resize_pool;
-   Eina_Bool valid : 1;
-   Eina_Bool reconfigure : 1;
-   Eina_Bool drawn : 1;
-};
-
-typedef struct _Shm_Surface Shm_Surface;
-struct _Shm_Surface
-{
-   int w, h;
-   int num_buff;
-   int compositor_version;
-
-   Shm_Leaf leaf[MAX_BUFFERS];
-   Shm_Leaf *current;
-
-   Eina_Bool alpha : 1;
-};
-
-static Eina_Bool _shm_leaf_create(Surface *s, Shm_Leaf *leaf, int w, int h);
-static void _shm_leaf_release(Shm_Leaf *leaf);
-static void _shm_leaf_destroy(Shm_Leaf *leaf);
-
-static struct wl_shm_pool *
-_shm_pool_make(struct wl_shm *shm, int size, void **data)
-{
-   struct wl_shm_pool *pool;
-   int fd = 0;
-   Eina_Tmpstr *fullname;
-   Efl_Vpath_File *file_obj;
-
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
-
-   /* check for valid wl_shm */
-   if (!shm) return NULL;
-
-   /* create tmp file name */
-   file_obj = efl_vpath_manager_fetch(EFL_VPATH_MANAGER_CLASS,
-                                      "(:run:)/evas-wayland_shm-XXXXXX");
-   fd = eina_file_mkstemp(efl_vpath_file_result_get(file_obj), &fullname);
-   efl_del(file_obj);
-
-   if (fd < 0)
-   /* try to create tmp file */
-   /* if ((fd = mkstemp(name)) < 0) */
-     {
-        ERR("Could not create temporary file: %m");
-        return NULL;
-     }
-
-   unlink(fullname);
-   eina_tmpstr_del(fullname);
-
-   /* try to truncate file to size */
-   if (ftruncate(fd, size) < 0)
-     {
-        ERR("Could not truncate temporary file: %m");
-        goto fd_err;
-     }
-
-   /* try to mmap the file */
-   *data = mmap(NULL, size, (PROT_READ | PROT_WRITE), MAP_SHARED, fd, 0);
-   if (*data == MAP_FAILED)
-     {
-        ERR("Could not mmap temporary file: %m");
-        goto fd_err;
-     }
-
-   /* NB: Commented out. Used for debugging rendering issues */
-   /* memset(*data, 127, size); */
-
-   /* create wl_shm_pool using fd */
-   pool = wl_shm_create_pool(shm, fd, size);
-
-   close(fd);
-
-   return pool;
-
-fd_err:
-   close(fd);
-   return NULL;
-}
-
-static Shm_Pool *
-_shm_pool_create(struct wl_shm *shm, size_t size)
-{
-   Shm_Pool *pool;
-
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
-
-   if (!(pool = malloc(sizeof(Shm_Pool)))) return NULL;
-
-   pool->pool = _shm_pool_make(shm, size, &pool->data);
-   if (!pool->pool) goto err;
-
-   pool->size = size;
-   pool->used = 0;
-
-   return pool;
-
-err:
-   free(pool);
-   return NULL;
-}
-
-static void 
-_shm_pool_destroy(Shm_Pool *pool)
-{
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
-
-   munmap(pool->data, pool->size);
-   wl_shm_pool_destroy(pool->pool);
-   free(pool);
-}
-
-static void *
-_shm_pool_allocate(Shm_Pool *pool, size_t size, int *offset)
-{
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
-
-   if ((pool->used + size) > pool->size)
-     {
-        WRN("Shm Pool Too Small");
-        return NULL;
-     }
-
-   *offset = pool->used;
-   pool->used += size;
-
-   return (char *)pool->data + *offset;
-}
-
-static void 
-_shm_pool_reset(Shm_Pool *pool)
-{
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
-
-   pool->used = 0;
-}
-
-static Shm_Data *
-_shm_data_create_from_pool(Shm_Pool *pool, int w, int h, Eina_Bool alpha)
-{
-   Shm_Data *data;
-   int len, offset;
-   uint32_t wl_format = WL_SHM_FORMAT_ARGB8888;
-
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
-
-   /* try to malloc space for data */
-   if (!(data = malloc(sizeof(Shm_Data))))
-     {
-        ERR("Could not allocate space for data");
-        return NULL;
-     }
-
-   len = (w * sizeof(int)) * h;
-   data->pool = NULL;
-
-   if (!(data->map = _shm_pool_allocate(pool, len, &offset)))
-     {
-        ERR("Could not map leaf data");
-        goto err;
-     }
-
-   if (alpha) 
-     wl_format = WL_SHM_FORMAT_ARGB8888;
-
-   data->buffer = 
-     wl_shm_pool_create_buffer(pool->pool, offset, w, h, 
-                               (w * sizeof(int)), wl_format);
-   if (!data->buffer)
-     {
-        ERR("Could not create buffer from pool");
-        goto err;
-     }
-
-   return data;
-
-err:
-   free(data);
-   return NULL;
-}
-
-static void 
-_shm_data_create(Shm_Pool *alt_pool, Shm_Data **ret, Surface *s, int w, int h)
-{
-   Shm_Surface *surface;
-   Shm_Pool *pool;
-   Shm_Data *data;
-   struct wl_shm *shm;
-
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
-
-   surface = s->surf.shm;
-   if (ret) *ret = NULL;
-
-   if (alt_pool)
-     {
-        _shm_pool_reset(alt_pool);
-        if ((data = _shm_data_create_from_pool(alt_pool, w, h, surface->alpha)))
-          goto out;
-     }
-
-   shm = ecore_wl2_display_shm_get(s->ob->ewd);
-   if (!(pool = _shm_pool_create(shm, ((w * sizeof(int)) * h))))
-     {
-        ERR("Could not create shm pool");
-        return;
-     }
-
-   if (!(data = _shm_data_create_from_pool(pool, w, h, surface->alpha)))
-     {
-        ERR("Could not create data from pool");
-        _shm_pool_destroy(pool);
-        return;
-     }
-
-   data->pool = pool;
-
-out:
-   if (ret) *ret = data;
-}
-
-static void 
-_shm_data_destroy(Shm_Data *data)
-{
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
-
-   if (data->buffer) wl_buffer_destroy(data->buffer);
-   if (data->pool) _shm_pool_destroy(data->pool);
-   free(data);
-}
-
-static void 
-_shm_buffer_release(void *data, struct wl_buffer *buffer)
-{
-   Surface *s;
-   Shm_Surface *surf;
-   Shm_Leaf *leaf;
-   int i = 0;
-
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
-
-   s = data;
-   surf = s->surf.shm;
-   for (; i < surf->num_buff; i++)
-     {
-        leaf = &surf->leaf[i];
-        if ((leaf->data) && (leaf->data->buffer == buffer))
-          {
-//             DBG("Buffer Released: %d", (int)(leaf - &surf->leaf[0]));
-             leaf->busy = 0;
-
-             if (leaf->reconfigure)
-               {
-                  _shm_leaf_release(leaf);
-                  _shm_leaf_create(s, leaf, surf->w, surf->h);
-               }
-
-             break;
-          }
-     }
-}
-
-static const struct wl_buffer_listener _shm_buffer_listener = 
-{
-   _shm_buffer_release
-};
-
-static Eina_Bool 
-_shm_leaf_create(Surface *s, Shm_Leaf *leaf, int w, int h)
-{
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
-
-   _shm_data_create(leaf->resize_pool, &leaf->data, s, w, h);
-   if (!leaf->data)
-     {
-        CRI("Failed to create leaf data");
-        abort();
-     }
-
-   leaf->w = w;
-   leaf->h = h;
-   leaf->valid = EINA_TRUE;
-   leaf->drawn = EINA_FALSE;
-   leaf->age = 0;
-   wl_buffer_add_listener(leaf->data->buffer, &_shm_buffer_listener, s);
-
-   return EINA_TRUE;
-}
-
-static void 
-_shm_leaf_release(Shm_Leaf *leaf)
-{
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
-   Shm_Pool *resize_pool;
-
-   /* if we delete resize_pool here we blow away the clever optimization
-    * it provides (and end up doing two allocations per resize when we
-    * might have done none at all).
-    */
-   resize_pool = leaf->resize_pool;
-   if (leaf->data) _shm_data_destroy(leaf->data);
-   memset(leaf, 0, sizeof(*leaf));
-   leaf->valid = EINA_FALSE;
-   leaf->resize_pool = resize_pool;
-}
-
-static void
-_shm_leaf_destroy(Shm_Leaf *leaf)
-{
-   _shm_leaf_release(leaf);
-   if (leaf->resize_pool) _shm_pool_destroy(leaf->resize_pool);
-   leaf->resize_pool = NULL;
-}
-
-static void
-_evas_shm_surface_destroy(Surface *surface)
-{
-   int i = 0;
-
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
-
-   if (!surface) return;
-
-   for (; i < surface->surf.shm->num_buff; i++)
-     _shm_leaf_destroy(&surface->surf.shm->leaf[i]);
-
-   free(surface->surf.shm);
-   surface->surf.shm = NULL;
-}
-
-static void
-_evas_shm_surface_reconfigure(Surface *s, int w, int h, uint32_t flags, Eina_Bool force)
-{
-   Shm_Surface *surface;
-   int i = 0, resize = 0;
-
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
-
-   surface = s->surf.shm;
-   resize = !!flags;
-
-   if (force)
-     {
-        for (; i < surface->num_buff; i++)
-          surface->leaf[i].busy = EINA_FALSE;
-     }
-
-   for (; i < surface->num_buff; i++)
-     {
-        /* don't resize any busy leafs */
-        if (surface->leaf[i].busy)
-          {
-             surface->leaf[i].reconfigure = EINA_TRUE;
-             continue;
-          }
-
-        /* clear this leaf */
-        _shm_leaf_release(&surface->leaf[i]);
-     }
-
-   surface->w = w;
-   surface->h = h;
-
-   if ((!w) || (!h)) return;
-   for (i = 0; i < surface->num_buff; i++)
-     {
-        if (surface->leaf[i].busy) continue;
-
-        if ((resize) && (!surface->leaf[i].resize_pool))
-          {
-             struct wl_shm *shm;
-
-             shm = ecore_wl2_display_shm_get(s->ob->ewd);
-             surface->leaf[i].resize_pool = 
-               _shm_pool_create(shm, 6 * 1024 * 1024);
-          }
-
-        if (!_shm_leaf_create(s, &surface->leaf[i], w, h))
-          {
-             CRI("Failed to create leaf data");
-             abort();
-          }
-     }
-}
-
-static Shm_Leaf *
-_evas_shm_surface_wait(Shm_Surface *surface)
-{
-   int i = 0, best = -1, best_age = -1;
-
-   for (i = 0; i < surface->num_buff; i++)
-     {
-        if (surface->leaf[i].busy) continue;
-        if ((surface->leaf[i].valid) && (surface->leaf[i].age > best_age))
-          {
-             best = i;
-             best_age = surface->leaf[i].age;
-          }
-     }
-
-   if (best >= 0) return &surface->leaf[best];
-   return NULL;
-}
-
-static int
-_evas_shm_surface_assign(Surface *s)
-{
-   int i;
-   Shm_Surface *surface;
-
-   surface = s->surf.shm;
-   surface->current = _evas_shm_surface_wait(surface);
-
-   /* If we ran out of buffers we're in trouble, reset all ages */
-   if (!surface->current)
-     {
-        WRN("No free SHM buffers, dropping a frame");
-        for (i = 0; i < surface->num_buff; i++)
-          {
-             if (surface->leaf[i].valid)
-               {
-                  surface->leaf[i].drawn = EINA_FALSE;
-                  surface->leaf[i].age = 0;
-               }
-          }
-        return 0;
-     }
-
-   /* Increment ages of all valid buffers */
-   for (i = 0; i < surface->num_buff; i++)
-     {
-        if (surface->leaf[i].valid && surface->leaf[i].drawn)
-          {
-             surface->leaf[i].age++;
-             if (surface->leaf[i].age > 4)
-               {
-                  surface->leaf[i].age = 0;
-                  surface->leaf[i].drawn = EINA_FALSE;
-               }
-          }
-     }
-
-   return surface->current->age;
-}
-
-static void *
-_evas_shm_surface_data_get(Surface *s, int *w, int *h)
-{
-   Shm_Surface *surface;
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
-
-   surface = s->surf.shm;
-   if (w) *w = 0;
-   if (h) *h = 0;
-
-   if (!surface->current)
-     {
-        /* WRN("All buffers held by server"); */
-        return NULL;
-     }
-
-   /* DBG("Leaf Data Get %d", (int)(leaf - &surface->leaf[0])); */
-
-   if (w) *w = surface->current->w;
-   if (h) *h = surface->current->h;
-
-   return surface->current->data->map;
-}
-
-static void
-_evas_shm_surface_post(Surface *s, Eina_Rectangle *rects, unsigned int count)
-{
-   Ecore_Wl2_Window *win;
-   struct wl_surface *wls;
-   Shm_Surface *surf;
-   Shm_Leaf *leaf;
-
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
-
-   surf = s->surf.shm;
-   leaf = surf->current;
-   if (!leaf) return;
-
-   win = s->info->info.wl2_win;
-   wls = ecore_wl2_window_surface_get(win);
-
-   ecore_wl2_window_buffer_attach(win, leaf->data->buffer, 0, 0, EINA_FALSE);
-
-   _evas_surface_damage(wls, surf->compositor_version,
-                        leaf->w, leaf->h, rects, count);
-
-   ecore_wl2_window_commit(s->info->info.wl2_win, EINA_TRUE);
-
-   leaf->busy = EINA_TRUE;
-   leaf->drawn = EINA_TRUE;
-   leaf->age = 0;
-   surf->current = NULL;
-}
-
-Eina_Bool
-_evas_shm_surface_create(Surface *s, int w, int h, int num_buff)
-{
-   Shm_Surface *surf;
-   int i = 0;
-
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
-
-   if (!(s->surf.shm = calloc(1, sizeof(Shm_Surface)))) return EINA_FALSE;
-   surf = s->surf.shm;
-
-   surf->w = w;
-   surf->h = h;
-   surf->num_buff = num_buff;
-   surf->alpha = s->info->info.destination_alpha;
-   surf->compositor_version = s->info->info.compositor_version;
-
-   if (w && h)
-     {
-        /* create surface buffers */
-        for (; i < surf->num_buff; i++)
-          {
-             if (!_shm_leaf_create(s, &(surf->leaf[i]), w, h))
-               {
-                  ERR("Could not create surface leaf");
-                  goto err;
-               }
-          }
-     }
-
-   s->type = SURFACE_SHM;
-   s->funcs.destroy = _evas_shm_surface_destroy;
-   s->funcs.reconfigure = _evas_shm_surface_reconfigure;
-   s->funcs.data_get = _evas_shm_surface_data_get;
-   s->funcs.assign = _evas_shm_surface_assign;
-   s->funcs.post = _evas_shm_surface_post;
-
-   return EINA_TRUE;
-
-err:
-   _evas_shm_surface_destroy(s);
-   return EINA_FALSE;
-}