e_comp_wl: Use e_surface_buffer_try_get

Change-Id: I4b523abad44a37a8e47fc87bf951f27985d22253

diff --git a/src/bin/server/e_comp_wl.c b/src/bin/server/e_comp_wl.c
index 2f892f44455461d8a83dd9bfcaba314d783f8194..1e25b2a8587cfc4a010f2cd5bbb119e4006ca55e 100644 (file)
--- a/src/bin/server/e_comp_wl.c
+++ b/src/bin/server/e_comp_wl.c
@@ -486,7 +486,7 @@ e_comp_wl_map_size_cal_from_buffer(E_Client *ec)
    int32_t width, height;
    int32_t scale;
 
-   buffer = e_pixmap_resource_get(ec->pixmap);
+   buffer = e_surface_buffer_try_get(surface);
    if (!buffer)
      {
         ec->comp_data->width_from_buffer = 0;
@@ -2711,6 +2711,7 @@ _e_comp_wl_surface_state_commit(E_Client *ec, E_Comp_Wl_Surface_State *state)
    E_Comp_Wl_Client_Data *cdata = e_client_cdata_get(ec);
    E_Comp_Wl_Buffer_Viewport *vp = &cdata->scaler.buffer_viewport;
    E_View_Client *view_client = e_client_view_get(ec);
+   E_Surface *surface = e_surface_from_ec(ec);
 
    if (ec->ignored)
      {
@@ -2904,13 +2905,11 @@ _e_comp_wl_surface_state_commit(E_Client *ec, E_Comp_Wl_Surface_State *state)
                                            state->frames);
    state->frames = NULL;
 
-   buffer = e_pixmap_resource_get(ec->pixmap);
+   buffer = e_surface_buffer_try_get(surface);
 
    /* put state damages into surface */
    if (view_client)
      {
-        E_Surface *surface = e_surface_from_ec(ec);
-
         /* FIXME: workaround for bad wayland egl driver which doesn't send damage request */
         if (!eina_list_count(state->damages) && !eina_list_count(state->buffer_damages))
           {

diff --git a/src/bin/server/e_comp_wl_video_buffer.c b/src/bin/server/e_comp_wl_video_buffer.c
index 59585f341444d5c24df6af66480c8c6b26157ffa..3d7dd58a824d553724d0adde28424bd78a6ed4cd 100644 (file)
--- a/src/bin/server/e_comp_wl_video_buffer.c
+++ b/src/bin/server/e_comp_wl_video_buffer.c
@@ -927,8 +927,8 @@ e_comp_wl_video_buffer_size_get(E_Client *ec, int *bw, int *bh)
 EINTERN void
 e_comp_wl_video_buffer_transform_scale_size_get(E_Client *ec, int *bw, int *bh)
 {
-   E_Comp_Wl_Buffer *buffer = e_pixmap_resource_get(ec->pixmap);
    E_Surface *surface = e_surface_from_ec(ec);
+   E_Comp_Wl_Buffer *buffer = e_surface_buffer_try_get(surface);
    int w, h, transform;
    int32_t scale;