transform: enhance debug logs

Change-Id: I2d36cf827d589ee11626f4101e4f8ba02ad5344f

diff --git a/src/bin/e_comp_object.c b/src/bin/e_comp_object.c
index df2883ff6a82c36ef06f850fa0607f2c494c67b9..65842d1469152f319d5cdac73f7454aa321c826c 100644 (file)
--- a/src/bin/e_comp_object.c
+++ b/src/bin/e_comp_object.c
@@ -5483,7 +5483,7 @@ e_comp_object_map_update(Evas_Object *obj)
      {
         if (evas_object_map_enable_get(cw->effect_obj))
           {
-             ELOGF("COMP", "transform map: disable", cw->ec->pixmap, cw->ec);
+             ELOGF("TRANSFORM", "map: disable", cw->ec->pixmap, cw->ec);
              evas_object_map_enable_set(cw->effect_obj, EINA_FALSE);
              evas_object_hide(cw->map_input_obj);
           }
@@ -5505,7 +5505,7 @@ e_comp_object_map_update(Evas_Object *obj)
 
    _e_comp_object_map_transform_pos(ec, x1, y1, &x, &y);
    evas_map_point_image_uv_set(map, 0, x, y);
-   l = snprintf(p, remain, " %d,%d", x, y);
+   l = snprintf(p, remain, "%d,%d", x, y);
    p += l, remain -= l;
 
    _e_comp_object_map_transform_pos(ec, x2, y1, &x, &y);
@@ -5523,8 +5523,9 @@ e_comp_object_map_update(Evas_Object *obj)
    l = snprintf(p, remain, " %d,%d", x, y);
    p += l, remain -= l;
 
-   DBG("ec(%p) obj(%p) transform map: point(%d,%d %dx%d) uv(%d,%d %d,%d %d,%d %d,%d => %s)",
-       cw->ec, obj, ec->x, ec->y, bw, bh, x1, y1, x2, y1, x2, y2, x1, y2, buffer);
+   ELOGF("TRANSFORM", "map: point(%d,%d %dx%d) uv(%d,%d %d,%d %d,%d %d,%d=>%s)",
+         cw->ec->pixmap, cw->ec,
+         ec->x, ec->y, bw, bh, x1, y1, x2, y1, x2, y2, x1, y2, buffer);
 
    evas_object_map_set(cw->effect_obj, map);
    evas_object_map_enable_set(cw->effect_obj, EINA_TRUE);

diff --git a/src/bin/e_comp_wl.c b/src/bin/e_comp_wl.c
index b9867e84588c064c37815e8717559515ca44b9cc..6fc49dd61b6c7460861fc86a8123591f66739362 100644 (file)
--- a/src/bin/e_comp_wl.c
+++ b/src/bin/e_comp_wl.c
@@ -424,9 +424,9 @@ e_comp_wl_map_apply(E_Client *ec)
    e_util_transform_texcoord_set(cdata->viewport_transform, 2, x2, y2);
    e_util_transform_texcoord_set(cdata->viewport_transform, 3, x1, y2);
 
-//   ELOGF("COMP", "viewport map: point(%d,%d %dx%d) uv(%d,%d %d,%d %d,%d %d,%d)",
-//         ec->pixmap, ec, ec->x, ec->y, ec->comp_data->width_from_viewport,
-//         ec->comp_data->height_from_viewport, x1, y1, x2, y1, x2, y2, x1, y2);
+   ELOGF("TRANSFORM", "viewport map: point(%d,%d %dx%d) uv(%d,%d %d,%d %d,%d %d,%d)",
+         ec->pixmap, ec, ec->x, ec->y, ec->comp_data->width_from_viewport,
+         ec->comp_data->height_from_viewport, x1, y1, x2, y1, x2, y2, x1, y2);
 
    e_client_transform_core_update(ec);
 }
@@ -2423,13 +2423,13 @@ _e_comp_wl_surface_state_commit(E_Client *ec, E_Comp_Wl_Surface_State *state)
         e_client_unignore(ec);
      }
 
-   if (vp->wait_for_transform_change && (vp->buffer.transform != state->buffer_viewport.buffer.transform))
+   if (vp->buffer.transform != state->buffer_viewport.buffer.transform)
      {
         int transform_change = (4 + state->buffer_viewport.buffer.transform - vp->buffer.transform) & 0x3;
 
-        DBG("ec(%p) wait_for_transform_change(%d) change(%d) : new(%d) old(%d)",
-            ec, vp->wait_for_transform_change, transform_change,
-            state->buffer_viewport.buffer.transform, vp->buffer.transform);
+        ELOGF("TRANSFORM", "buffer_transform changed: old(%d) new(%d)",
+              ec->pixmap, ec,
+              vp->buffer.transform, state->buffer_viewport.buffer.transform);
 
         if (transform_change == vp->wait_for_transform_change)
           vp->wait_for_transform_change = 0;

diff --git a/src/bin/e_comp_wl_rsm.c b/src/bin/e_comp_wl_rsm.c
index a4d1bd2908fab56d146a77a0f07c8d91462b551e..efd63351cfdd1aaed87955574aacfac9e3b351b0 100644 (file)
--- a/src/bin/e_comp_wl_rsm.c
+++ b/src/bin/e_comp_wl_rsm.c
@@ -856,7 +856,7 @@ _remote_surface_ignore_output_transform_send(E_Comp_Wl_Remote_Common *common)
 ignore:
    if (common->ignore_output_transform != EINA_TRUE)
      {
-        RSMINF("ignore output transform: %s", NULL, common->ec, "common", NULL, msg);
+        ELOGF("TRANSFORM", "ignore output transform: %s", common->ec->pixmap, common->ec, msg);
         e_comp_screen_rotation_ignore_output_transform_send(common->ec, EINA_TRUE);
         common->ignore_output_transform = EINA_TRUE;
      }
@@ -865,7 +865,7 @@ ignore:
 no_ignore:
    if (common->ignore_output_transform != EINA_FALSE)
      {
-        RSMINF("not ignore output transform: %s", NULL, common->ec, "common", NULL, msg);
+        ELOGF("TRANSFORM", "not ignore output transform: %s", common->ec->pixmap, common->ec, msg);
         e_comp_screen_rotation_ignore_output_transform_send(common->ec, EINA_FALSE);
         common->ignore_output_transform = EINA_FALSE;
      }
@@ -2887,9 +2887,22 @@ _e_comp_wl_remote_surface_state_commit(E_Client *ec, E_Comp_Wl_Surface_State *st
    E_Comp_Wl_Remote_Buffer *remote_buffer;
    struct wl_resource *remote_buffer_resource;
    Eina_List *l, *ll;
+   E_Comp_Wl_Buffer_Viewport *vp = &ec->comp_data->scaler.buffer_viewport;
 
    if (e_object_is_del(E_OBJECT(ec))) return;
 
+   if (vp->buffer.transform != state->buffer_viewport.buffer.transform)
+     {
+        int transform_change = (4 + state->buffer_viewport.buffer.transform - vp->buffer.transform) & 0x3;
+
+        ELOGF("TRANSFORM", "buffer_transform changed: old(%d) new(%d)",
+              ec->pixmap, ec,
+              vp->buffer.transform, state->buffer_viewport.buffer.transform);
+
+        if (transform_change == vp->wait_for_transform_change)
+          vp->wait_for_transform_change = 0;
+     }
+
    ec->comp_data->scaler.buffer_viewport = state->buffer_viewport;
 
    if (state->new_attach)

diff --git a/src/bin/e_output.c b/src/bin/e_output.c
index b46a30e262e7b3fd7da67e11d416724f248bb716..26c63b540de677ea9f410e668029a3de3a9757c0 100644 (file)
--- a/src/bin/e_output.c
+++ b/src/bin/e_output.c
@@ -1241,6 +1241,8 @@ e_output_rotate(E_Output *output, int rotate)
                          output->info.size.w, output->info.size.h,
                          output->config.mode.refresh, 0, transform);
 
+   ELOGF("TRANSFORM", "output(%s) transform(%d)", NULL, NULL, output->info.name, transform);
+
    return EINA_TRUE;
 }