[EGIT] [core/efl] master 11/15: wayland_shm: Use ecore_wl2_window_buffer_attach

[Derek Foreman]

derekf pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=3290e6da1026f87e71508d57ffca697c1e8df02f

commit 3290e6da1026f87e71508d57ffca697c1e8df02f
Author: Derek Foreman <der...@osg.samsung.com>
Date:   Thu Aug 17 15:12:57 2017 -0500

    wayland_shm: Use ecore_wl2_window_buffer_attach
    
    No longer calling wl_surface_attach directly.
---
 src/modules/evas/engines/wayland_shm/evas_dmabuf.c | 12 ++++++++----
 src/modules/evas/engines/wayland_shm/evas_shm.c    |  6 ++++--
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/modules/evas/engines/wayland_shm/evas_dmabuf.c 
b/src/modules/evas/engines/wayland_shm/evas_dmabuf.c
index aa6ff2e5b4..ce408210c1 100644
--- a/src/modules/evas/engines/wayland_shm/evas_dmabuf.c
+++ b/src/modules/evas/engines/wayland_shm/evas_dmabuf.c
@@ -479,6 +479,7 @@ _create_succeeded(void *data,
                  struct zwp_linux_buffer_params_v1 *params,
                  struct wl_buffer *new_buffer)
 {
+   Ecore_Wl2_Window *win;
    struct wl_surface *wls;
    Dmabuf_Buffer *b = data;
 
@@ -500,8 +501,9 @@ _create_succeeded(void *data,
    if (b != b->surface->pre) return;
 
    /* This buffer was drawn into before it had a handle */
-   wls = ecore_wl2_window_surface_get(b->surface->surface->info->info.wl2_win);
-   wl_surface_attach(wls, b->wl_buffer, 0, 0);
+   win = b->surface->surface->info->info.wl2_win;
+   wls = ecore_wl2_window_surface_get(win);
+   ecore_wl2_window_buffer_attach(win, b->wl_buffer, 0, 0, EINA_FALSE);
    _evas_surface_damage(wls, b->surface->compositor_version,
                         b->w, b->h, NULL, 0);
    ecore_wl2_window_commit(b->surface->surface->info->info.wl2_win, EINA_TRUE);
@@ -672,6 +674,7 @@ _evas_dmabuf_surface_post(Surface *s, Eina_Rectangle 
*rects, unsigned int count,
    struct wl_surface *wls;
    Dmabuf_Surface *surface;
    Dmabuf_Buffer *b;
+   Ecore_Wl2_Window *win;
 
    surface = s->surf.dmabuf;
    b = surface->current;
@@ -696,10 +699,11 @@ _evas_dmabuf_surface_post(Surface *s, Eina_Rectangle 
*rects, unsigned int count,
      }
    surface->pre = NULL;
 
-   wls = ecore_wl2_window_surface_get(s->info->info.wl2_win);
+   win = s->info->info.wl2_win;
+   wls = ecore_wl2_window_surface_get(win);
    if (!hidden)
      {
-        wl_surface_attach(wls, b->wl_buffer, 0, 0);
+        ecore_wl2_window_buffer_attach(win, b->wl_buffer, 0, 0, EINA_FALSE);
         _evas_surface_damage(wls, surface->compositor_version,
                              b->w, b->h, rects, count);
      }
diff --git a/src/modules/evas/engines/wayland_shm/evas_shm.c 
b/src/modules/evas/engines/wayland_shm/evas_shm.c
index feeb4bf12c..e7acd146fc 100644
--- a/src/modules/evas/engines/wayland_shm/evas_shm.c
+++ b/src/modules/evas/engines/wayland_shm/evas_shm.c
@@ -536,6 +536,7 @@ _evas_shm_surface_data_get(Surface *s, int *w, int *h)
 void
 _evas_shm_surface_post(Surface *s, Eina_Rectangle *rects, unsigned int count, 
Eina_Bool hidden)
 {
+   Ecore_Wl2_Window *win;
    struct wl_surface *wls;
    Shm_Surface *surf;
    Shm_Leaf *leaf;
@@ -546,11 +547,12 @@ _evas_shm_surface_post(Surface *s, Eina_Rectangle *rects, 
unsigned int count, Ei
    leaf = surf->current;
    if (!leaf) return;
 
-   wls = ecore_wl2_window_surface_get(s->info->info.wl2_win);
+   win = s->info->info.wl2_win;
+   wls = ecore_wl2_window_surface_get(win);
 
    if (!hidden)
      {
-        wl_surface_attach(wls, leaf->data->buffer, 0, 0);
+        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);

--