Deprecate e_comp_wl_output_buffer_transform_get

It's deprecated since the commit f1c017fe.

Change-Id: Iccbb14b1222fc128663d634beb28f26c78ed0258

diff --git a/src/bin/compmgr/e_comp_object.c b/src/bin/compmgr/e_comp_object.c
index 17376c5abb0d955855db2b5146809d09c91692f5..bf04aa906ec612cfa003e9aaaa791501f26e3efd 100644 (file)
--- a/src/bin/compmgr/e_comp_object.c
+++ b/src/bin/compmgr/e_comp_object.c
@@ -528,7 +528,7 @@ _e_comp_object_map_transform_pos(E_Client *ec, int sx, int sy, int *dx, int *dy)
         return;
      }
 
-   transform = e_comp_wl_output_buffer_transform_get(ec);
+   transform = e_surface_buffer_transform_get(surface);
 
    e_pixmap_size_get(ec->pixmap, &bw, &bh);
 
@@ -4546,7 +4546,7 @@ e_comp_object_map_update(Evas_Object *obj)
 
    if ((!cw->redirected) ||
        (e_client_video_hw_composition_check(ec)) ||
-       (!e_comp_wl_output_buffer_transform_get(ec) &&
+       (!e_surface_buffer_transform_get(surface) &&
         e_surface_buffer_scale_get(surface) == 1))
      {
         if (evas_object_map_enable_get(cw->effect_obj))

diff --git a/src/bin/core/e_view_client.c b/src/bin/core/e_view_client.c
index 2a2127dba7c458f1d9a239ef8ca371b18ce8eb57..a07e45e74b03edf0782ba55a7292686b0542f755 100644 (file)
--- a/src/bin/core/e_view_client.c
+++ b/src/bin/core/e_view_client.c
@@ -52,7 +52,7 @@ _e_view_client_map_transform_pos(E_Client *ec, int sx, int sy, int *dx, int *dy)
         return;
      }
 
-   transform = e_comp_wl_output_buffer_transform_get(ec);
+   transform = e_surface_buffer_transform_get(surface);
 
    e_pixmap_size_get(ec->pixmap, &bw, &bh);
 

diff --git a/src/bin/displaymgr/e_hwc_window.c b/src/bin/displaymgr/e_hwc_window.c
index dde98afe5642b15c5973f600ea61ebfa1bbf1078..af6bebe4f01a4f69a1a7887f741db23c39f337b6 100644 (file)
--- a/src/bin/displaymgr/e_hwc_window.c
+++ b/src/bin/displaymgr/e_hwc_window.c
@@ -1083,7 +1083,7 @@ _e_hwc_window_commit_restriction_update(E_Hwc_Window  *hwc_window)
         output = e_output_find(hwc_window->zone->output_id);
         if (output)
           {
-             transform = e_comp_wl_output_buffer_transform_get(ec);
+             transform = e_surface_buffer_transform_get(e_surface_from_ec(ec));
              if ((output->config.rotation / 90) != transform)
                e_hwc_window_restriction_set(hwc_window, E_HWC_WINDOW_RESTRICTION_OUTPUT_TRANSFORM);
              else
@@ -1915,7 +1915,7 @@ _e_hwc_window_info_get(E_Hwc_Window *hwc_window, tdm_hwc_window_info *hwc_win_in
         hwc_win_info->dst_pos.y = dst_y;
      }
 
-   transform = e_comp_wl_output_buffer_transform_get(ec);
+   transform = e_surface_buffer_transform_get(e_surface_from_ec(ec));
    switch (transform)
      {
       case WL_OUTPUT_TRANSFORM_90:

diff --git a/src/bin/server/e_comp_wl.c b/src/bin/server/e_comp_wl.c
index f1e2aaf4ae788605d6212708a43db8b1226ef2bf..25d0b0a3701f4f076f40d7ca07b3db2976d4b018 100644 (file)
--- a/src/bin/server/e_comp_wl.c
+++ b/src/bin/server/e_comp_wl.c
@@ -463,7 +463,7 @@ e_comp_wl_map_size_cal_from_buffer(E_Client *ec)
      }
 
    scale = e_surface_buffer_scale_get(surface);
-   switch (e_comp_wl_output_buffer_transform_get(ec))
+   switch (e_surface_buffer_transform_get(surface))
      {
       case WL_OUTPUT_TRANSFORM_90:
       case WL_OUTPUT_TRANSFORM_270:
@@ -2649,7 +2649,7 @@ _e_comp_wl_surface_damage_set(E_Client *ec)
 
    pixman_region32_init(&damages);
 
-   _pixman_region_buffer_damage_apply(&damages, surface, e_comp_wl_output_buffer_transform_get(ec));
+   _pixman_region_buffer_damage_apply(&damages, surface, e_surface_buffer_transform_get(surface));
    _pixman_region_surface_damage_apply(&damages, surface);
 
    rects = pixman_region32_rectangles(&damages, &nrects);
@@ -5784,7 +5784,7 @@ e_comp_wl_surface_viewport_get(E_Client *ec, Eina_Rectangle *buffer_viewport, Ei
 
         if (transform)
           {
-             buffer_transform = e_comp_wl_output_buffer_transform_get(ec);
+             buffer_transform = e_surface_buffer_transform_get(e_surface_from_ec(ec));
              /* NOTE Merge transform value from evas_map with E_Comp_Wl_Buffer_Viewport's one.
               * Since buffer.transform isn't applied using evas_map,
               * it has to be taken into account here to apply buffer.transform

diff --git a/src/bin/server/e_comp_wl_buffer.c b/src/bin/server/e_comp_wl_buffer.c
index 1866d7df29c2a13114ee408f8e325e14e78c69df..84143a95a4738ecc42ff4f5f4c45138aee6a26a6 100644 (file)
--- a/src/bin/server/e_comp_wl_buffer.c
+++ b/src/bin/server/e_comp_wl_buffer.c
@@ -578,9 +578,5 @@ e_comp_wl_buffer_viewport_wait_for_transform_change_set(E_Comp_Wl_Buffer_Viewpor
 EINTERN enum wl_output_transform
 e_comp_wl_buffer_window_rotation_get(E_Comp_Wl_Buffer *buffer)
 {
-   if (buffer->type != E_COMP_WL_BUFFER_TYPE_NATIVE &&
-       buffer->type != E_COMP_WL_BUFFER_TYPE_TBM)
-     return WL_OUTPUT_TRANSFORM_NORMAL;
-
    return buffer->transform;
 }

diff --git a/src/bin/server/e_comp_wl_capture.c b/src/bin/server/e_comp_wl_capture.c
index 919c0c79ae4374a6925f548ea8ba24a94f38a31c..458bac03e443ec9e9cfd66fd638b8b0858c13a53 100644 (file)
--- a/src/bin/server/e_comp_wl_capture.c
+++ b/src/bin/server/e_comp_wl_capture.c
@@ -1,6 +1,7 @@
 #include "e_comp_wl_capture_intern.h"
 #include "e_comp_wl_intern.h"
 #include "e_comp_wl_tbm_intern.h"
+#include "e_compositor_intern.h"
 #include "e_util_video_intern.h"
 #include "e_client_intern.h"
 #include "e_client_video_intern.h"
@@ -1205,7 +1206,7 @@ _e_capture_client_child_data_create(Thread_Data *td, E_Client *ec)
    capture_data->w = ec->w;
    capture_data->h = ec->h;
 
-   capture_data->transform = e_comp_wl_output_buffer_transform_get(ec);
+   capture_data->transform = e_surface_buffer_transform_get(e_surface_from_ec(ec));
 
    e_comp_wl_buffer_reference(&ecc->buffer_ref, buffer);
    switch (buffer->type)
@@ -1551,7 +1552,7 @@ _e_capture_client_save(E_Capture_Client *ecc,
    e_object_ref(E_OBJECT(ec));
    td->ec = ec;
 
-   td->transform = e_comp_wl_output_buffer_transform_get(ec);
+   td->transform = e_surface_buffer_transform_get(e_surface_from_ec(ec));
    td->image_dir = eina_stringshare_ref(dir);
    td->image_name = eina_stringshare_ref(name);
    td->func_end = func_end;

diff --git a/src/bin/server/e_comp_wl_rsm.c b/src/bin/server/e_comp_wl_rsm.c
index cdb586284f1b816f1e6544fba3c0c74c8960d8f8..f40bd3bca582f0ad1815d2644170fbcaee062376 100644 (file)
--- a/src/bin/server/e_comp_wl_rsm.c
+++ b/src/bin/server/e_comp_wl_rsm.c
@@ -617,7 +617,7 @@ _remote_surface_changed_buff_protocol_send(E_Comp_Wl_Remote_Surface *rs,
      }
 
    RSMDBG("CHANGED_BUFF: src_ec(%p) bind_ec(%p) buffer_transform(%d)",
-          rs->ec, "SURFACE", rs, src_ec, rs->bind_ec, e_comp_wl_output_buffer_transform_get(src_ec));
+          rs->ec, "SURFACE", rs, src_ec, rs->bind_ec, e_surface_buffer_transform_get(e_surface_from_ec(src_ec)));
 
    /* if unbinded, buffer_transform should be 0 for consumer to composite buffers.
     * Otherwise, we skip sending a change_buffer event because buffer is not ready.
@@ -625,7 +625,7 @@ _remote_surface_changed_buff_protocol_send(E_Comp_Wl_Remote_Surface *rs,
    if (pending)
      output_transform = e_comp_wl_output_pending_buffer_transform_get(src_ec);
    else
-     output_transform = e_comp_wl_output_buffer_transform_get(src_ec);
+     output_transform = e_surface_buffer_transform_get(e_surface_from_ec(src_ec));
 
    if (!rs->bind_ec && output_transform)
      {

diff --git a/src/bin/server/e_comp_wl_video_buffer.c b/src/bin/server/e_comp_wl_video_buffer.c
index 3490be68d6fbb37e47818264ebdd2bdc9bf3ea44..0ddc6dbe16e7b69e040a16413f2f02bab63e5866 100644 (file)
--- a/src/bin/server/e_comp_wl_video_buffer.c
+++ b/src/bin/server/e_comp_wl_video_buffer.c
@@ -960,7 +960,7 @@ e_comp_wl_video_buffer_transform_scale_size_get(E_Client *ec, int *bw, int *bh)
         h = buffer->h;
      }
 
-   transform = e_comp_wl_output_buffer_transform_get(ec);
+   transform = e_surface_buffer_transform_get(surface);
 
    scale = e_surface_buffer_scale_get(surface);
    switch (transform)

diff --git a/src/bin/server/e_comp_wl_viewport.c b/src/bin/server/e_comp_wl_viewport.c
index 630bef7426003b30eead637cf5d98fe812c3be2d..cc2f06df5c56ddc52fa77d02857776df7cbda7f4 100644 (file)
--- a/src/bin/server/e_comp_wl_viewport.c
+++ b/src/bin/server/e_comp_wl_viewport.c
@@ -988,7 +988,7 @@ _get_parent_transform(E_Viewport *viewport)
    if (!epc->comp_data || e_object_is_del(E_OBJECT(epc)))
      return 0;
 
-   ptransform = e_comp_wl_output_buffer_transform_get(epc);
+   ptransform = e_surface_buffer_transform_get(e_surface_from_ec(epc));
 
    topmost = e_comp_wl_topmost_parent_get(epc);
 
@@ -1022,7 +1022,7 @@ _destination_mode_calculate_destination(E_Viewport *viewport, Eina_Rectangle *pr
    else
      e_comp_wl_video_buffer_size_get(ec, &sw, &sh);
 
-   transform = e_comp_wl_output_buffer_transform_get(ec);
+   transform = e_surface_buffer_transform_get(viewport->surface);
 
    if (transform % 2)
      SWAP(sw, sh);
@@ -1106,7 +1106,7 @@ _destination_mode_calculate_destination(E_Viewport *viewport, Eina_Rectangle *pr
              if (!epc->comp_data || e_object_is_del(E_OBJECT(epc)))
                return EINA_FALSE;
 
-             ptransform = e_comp_wl_output_buffer_transform_get(epc);
+             ptransform = e_surface_buffer_transform_get(e_surface_from_ec(epc));
 
              PIN("parent's transform(%d)", ptransform);
 
@@ -1270,7 +1270,7 @@ _e_comp_wl_viewport_crop_by_parent(E_Viewport *viewport, Eina_Rectangle *parent,
    rw = (double)crop.w / dst->w;
    rh = (double)crop.h / dst->h;
 
-   transform = e_comp_wl_output_buffer_transform_get(viewport->ec);
+   transform = e_surface_buffer_transform_get(viewport->surface);
    if (transform % 2)
      {
         SWAP(rx, ry);
@@ -1465,7 +1465,7 @@ _e_comp_wl_viewport_apply_source(E_Viewport *viewport)
      }
 
    _source_transform_to_surface(bw, bh,
-                                e_comp_wl_output_buffer_transform_get(ec), 1,
+                                e_surface_buffer_transform_get(viewport->surface), 1,
                                 &rect, &rect);
 
    changed = e_surface_viewporter_source_box_set(viewport->viewporter, &rect);

diff --git a/src/include/e_comp_wl.h b/src/include/e_comp_wl.h
index f5c13539a2288f51b9f482b1b98c8000a60eb939..a412777199782fc444876c8954fcdd964df80070 100644 (file)
--- a/src/include/e_comp_wl.h
+++ b/src/include/e_comp_wl.h
@@ -563,7 +563,7 @@ struct _E_Comp_Wl_Intercept_Hook
 E_API void                      e_comp_wl_buffer_reference(E_Comp_Wl_Buffer_Ref *ref, E_Comp_Wl_Buffer *buffer);
 E_API void                      e_comp_wl_touch_cancel(void);
 E_API E_Client                 *e_comp_wl_topmost_parent_get(E_Client *ec);
-E_API enum wl_output_transform  e_comp_wl_output_buffer_transform_get(E_Client *ec);
+E_DEPRECATED E_API enum wl_output_transform  e_comp_wl_output_buffer_transform_get(E_Client *ec); // replaced with e_surface_buffer_transform_get
 E_API void                      e_comp_wl_map_size_cal_from_buffer(E_Client *ec);
 E_API void                      e_comp_wl_map_size_cal_from_viewport(E_Client *ec);
 E_API void                      e_comp_wl_map_apply(E_Client *ec);