support GL app by EVAS_NATIVE_SURFACE_WL

Change-Id: I9e37f4600a308e6a942638722c7c52984e9f9980

diff --git a/src/lib/object.c b/src/lib/object.c
index ed7ff982e96ff15ac56b88e879aa26525fdcb218..6a7c3df350a1ea87fc18c031371b97ea5703da54 100644 (file)
--- a/src/lib/object.c
+++ b/src/lib/object.c
@@ -405,7 +405,6 @@ _pepper_efl_object_cb_surface_destroy(pepper_event_listener_t *listener EINA_UNU
 
    po->es = NULL;
    po->surface = NULL;
-   po->tbm_surface = NULL;
    PE_FREE_FUNC(po->surface_destroy_listener, pepper_event_listener_remove);
 }
 
@@ -514,8 +513,6 @@ pepper_efl_object_buffer_attach(Evas_Object *obj, int *w, int *h)
      }
    else if ((tbm_surface = wayland_tbm_server_get_surface(NULL, buf_res)))
      {
-       po->tbm_surface = tbm_surface;
-
        bw = tbm_surface_get_width(tbm_surface);
        bh = tbm_surface_get_height(tbm_surface);
 
@@ -564,13 +561,13 @@ pepper_efl_object_render(Evas_Object *obj)
         evas_object_image_data_set(po->img, wl_shm_buffer_get_data(po->shm_buffer));
         evas_object_image_data_update_add(po->img, 0, 0, po->w, po->h);
      }
-   else if(po->tbm_surface)
+   else
      {
         Evas_Native_Surface ns;
 
         ns.version = EVAS_NATIVE_SURFACE_VERSION;
-        ns.type = EVAS_NATIVE_SURFACE_TBM;
-        ns.data.tbm.buffer = po->tbm_surface;
+        ns.type = EVAS_NATIVE_SURFACE_WL;
+        ns.data.wl.legacy_buffer = pepper_buffer_get_resource(po->buffer);
 
         evas_object_image_size_set(po->img, po->w, po->h);
         evas_object_image_native_surface_set(po->img, &ns);

diff --git a/src/lib/object.h b/src/lib/object.h
index 742476791d2772892068a38bc36cea33ebc818fc..3394752ee85627edc072a8c5a99823a679b6ca64 100644 (file)
--- a/src/lib/object.h
+++ b/src/lib/object.h
@@ -18,7 +18,6 @@ struct pepper_efl_object
    pepper_event_listener_t *surface_destroy_listener;
 
    struct wl_shm_buffer *shm_buffer;
-   tbm_surface_h tbm_surface;
    int x, y, w, h;
 
    struct