e_plane: wrap member of display information to struct

added current displaying ec and renderer to display info.

Change-Id: I36878c7772a5f0053ba7254fc5354ca0f81871f5

diff --git a/src/bin/e_plane.c b/src/bin/e_plane.c
index 4cd250b97266eddbce7565fb7d519ab68c197ad3..7b0b26518d9d217551e6b6c784d16538c7a97485 100644 (file)
--- a/src/bin/e_plane.c
+++ b/src/bin/e_plane.c
@@ -369,7 +369,7 @@ _e_plane_cursor_surface_acquire(E_Plane *plane)
 
    tsurface = e_plane_renderer_cursor_surface_get(renderer);
 
-   if (plane->displaying_buffer_ref.buffer != buffer || !tsurface)
+   if (plane->display_info.buffer_ref.buffer != buffer || !tsurface)
      {
         if (!e_plane_renderer_cursor_surface_refresh(renderer, ec))
           {
@@ -983,11 +983,12 @@ e_plane_commit_data_release(E_Plane_Commit_Data *data)
         if (plane_trace_debug)
           ELOGF("E_PLANE", "Done    Plane(%p) zpos(%d)   data(%p)::Unset", NULL, NULL, plane, plane->zpos, data);
 
-        e_comp_wl_buffer_reference(&plane->displaying_buffer_ref, NULL);
-        if (plane->displaying_buffer_tsurface)
+        e_comp_wl_buffer_reference(&plane->display_info.buffer_ref, NULL);
+        if (plane->display_info.tsurface)
           {
-             tbm_surface_internal_unref(plane->displaying_buffer_tsurface);
-             plane->displaying_buffer_tsurface = NULL;
+             e_plane_renderer_surface_queue_release(plane->renderer, plane->display_info.tsurface);
+             tbm_surface_internal_unref(plane->display_info.tsurface);
+             plane->display_info.tsurface = NULL;
           }
 
         plane->pending_commit_data_list = eina_list_remove(plane->pending_commit_data_list, data);
@@ -1029,15 +1030,15 @@ e_plane_commit_data_release(E_Plane_Commit_Data *data)
           }
         else
           {
-             if (displaying_tsurface && !plane->displaying_buffer_ref.buffer)
+             if (displaying_tsurface && !plane->display_info.buffer_ref.buffer)
                e_plane_renderer_surface_queue_release(plane->renderer, displaying_tsurface);
           }
 
-        e_comp_wl_buffer_reference(&plane->displaying_buffer_ref, NULL);
-        if (plane->displaying_buffer_tsurface)
+        e_comp_wl_buffer_reference(&plane->display_info.buffer_ref, NULL);
+        if (plane->display_info.tsurface)
           {
-             tbm_surface_internal_unref(plane->displaying_buffer_tsurface);
-             plane->displaying_buffer_tsurface = NULL;
+             tbm_surface_internal_unref(plane->display_info.tsurface);
+             plane->display_info.tsurface = NULL;
           }
      }
    else
@@ -1073,21 +1074,21 @@ e_plane_commit_data_release(E_Plane_Commit_Data *data)
                   /* release */
                   if (displaying_tsurface)
                     {
-                       if (!plane->displaying_buffer_ref.buffer)
+                       if (!plane->display_info.buffer_ref.buffer)
                          e_plane_renderer_surface_queue_release(plane->renderer, displaying_tsurface);
                    }
                }
           }
 
-        e_comp_wl_buffer_reference(&plane->displaying_buffer_ref, data->buffer_ref.buffer);
+        e_comp_wl_buffer_reference(&plane->display_info.buffer_ref, data->buffer_ref.buffer);
 
-        if (plane->displaying_buffer_tsurface)
+        if (plane->display_info.tsurface)
           {
-             tbm_surface_internal_unref(plane->displaying_buffer_tsurface);
-             plane->displaying_buffer_tsurface = NULL;
+             tbm_surface_internal_unref(plane->display_info.tsurface);
+             plane->display_info.tsurface = NULL;
           }
         tbm_surface_internal_ref(tsurface);
-        plane->displaying_buffer_tsurface = tsurface;
+        plane->display_info.tsurface = tsurface;
 
         e_comp_wl_buffer_reference(&data->buffer_ref, NULL);
      }
@@ -1389,7 +1390,7 @@ e_plane_show_state(E_Plane *plane)
    EINA_SAFETY_ON_NULL_RETURN(plane);
 
    ELOGF("E_PLANE", "Plane(%p) zpos(%d) ec(%p) display tsurface(%p)",
-         NULL, NULL, plane, plane->zpos, plane->ec, plane->displaying_buffer_tsurface);
+         NULL, NULL, plane, plane->zpos, plane->ec, plane->display_info.tsurface);
 
    if (plane->renderer)
      e_plane_renderer_show_state(plane->renderer);

diff --git a/src/bin/e_plane.h b/src/bin/e_plane.h
index 81a81150a1f136309915ade101d35b2e0c90a59d..d380cdb71cd2d822359cde558c67ecc7774d2e55 100644 (file)
--- a/src/bin/e_plane.h
+++ b/src/bin/e_plane.h
@@ -57,9 +57,6 @@ struct _E_Plane
    tdm_info_layer        info;
    tbm_surface_h         tsurface;
 
-   E_Comp_Wl_Buffer_Ref  displaying_buffer_ref;
-   tbm_surface_h         displaying_buffer_tsurface;
-
    E_Plane_Renderer     *renderer;
    E_Output             *output;
 
@@ -76,6 +73,13 @@ struct _E_Plane
    Eina_Bool             need_ev;
 
    E_Plane_Role          role;
+
+   /* current display information */
+   struct
+   {
+      E_Comp_Wl_Buffer_Ref  buffer_ref;
+      tbm_surface_h         tsurface;
+   } display_info;
 };
 
 struct _E_Plane_Commit_Data {