e_plane_renderer: release displaying surface when candidated ec is deactivated

for avoiding e20 and candidated client use scanout buffer at the same time

Change-Id: Ib29d47fcab4fe6db90db1fe880517e3738ec196f

diff --git a/src/bin/e_plane_renderer.c b/src/bin/e_plane_renderer.c
index 630e7824e280bfcb52c2028d2474fc9ba497dc37..7b90e5e352c0c410004e3265847eef834c24fa3a 100644 (file)
--- a/src/bin/e_plane_renderer.c
+++ b/src/bin/e_plane_renderer.c
@@ -347,29 +347,36 @@ _e_plane_renderer_client_exported_surfaces_release(E_Plane_Renderer_Client *rend
 
    EINA_SAFETY_ON_NULL_RETURN(renderer_client);
 
-   EINA_LIST_FOREACH_SAFE(renderer_client->exported_surfaces, l_s, ll_s, tsurface)
-     {
-        if (!tsurface) continue;
 
-        if (tsurface == renderer->previous_tsurface)
-          {
-             _e_plane_renderer_exported_surface_release(renderer, tsurface);
-             renderer_client->exported_surfaces = eina_list_remove_list(renderer_client->exported_surfaces, l_s);
-             break;
-          }
+   if (renderer_client->state == E_PLANE_RENDERER_CLIENT_STATE_CANDIDATED)
+     {
+        e_plane_renderer_surface_queue_release(renderer, renderer->displaying_tsurface);
      }
-
-   EINA_LIST_FOREACH_SAFE(renderer_client->exported_surfaces, l_s, ll_s, tsurface)
+   else
      {
-        if (!tsurface) continue;
-
-        if (tsurface == renderer->displaying_tsurface)
+        EINA_LIST_FOREACH_SAFE(renderer_client->exported_surfaces, l_s, ll_s, tsurface)
           {
-             _e_plane_renderer_exported_surface_release(renderer, tsurface);
-             renderer_client->exported_surfaces = eina_list_remove_list(renderer_client->exported_surfaces, l_s);
-             break;
+             if (!tsurface) continue;
+
+             if (tsurface == renderer->previous_tsurface)
+               {
+                  _e_plane_renderer_exported_surface_release(renderer, tsurface);
+                  renderer_client->exported_surfaces = eina_list_remove_list(renderer_client->exported_surfaces, l_s);
+                  break;
+               }
           }
 
+        EINA_LIST_FOREACH_SAFE(renderer_client->exported_surfaces, l_s, ll_s, tsurface)
+          {
+             if (!tsurface) continue;
+
+             if (tsurface == renderer->displaying_tsurface)
+               {
+                  _e_plane_renderer_exported_surface_release(renderer, tsurface);
+                  renderer_client->exported_surfaces = eina_list_remove_list(renderer_client->exported_surfaces, l_s);
+                  break;
+               }
+          }
      }
 
    EINA_LIST_FOREACH_SAFE(renderer_client->exported_surfaces, l_s, ll_s, tsurface)
@@ -866,14 +873,14 @@ e_plane_renderer_deactivate(E_Plane_Renderer *renderer)
      }
 
 done:
+   _e_plane_renderer_client_exported_surfaces_release(renderer_client, renderer);
+
    renderer->state = E_PLANE_RENDERER_STATE_NONE;
    renderer->ec = NULL;
 
    renderer_client->state = E_PLANE_RENDERER_CLIENT_STATE_NONE;
    renderer_client->renderer = NULL;
 
-   _e_plane_renderer_client_exported_surfaces_release(renderer_client, renderer);
-
    return EINA_TRUE;
 }