e_plane & e_plane_renderer: use e_comp's tqueue and remove ecore drm dependency

Change-Id: If0e1438816899f216a243fc5d37cb5dd15f8c1da
Signed-off-by: Sung-Jin Park <sj76.park@samsung.com>

diff --git a/src/bin/e_plane.c b/src/bin/e_plane.c
index 3d2d58d..49e7422 100644 (file)
--- a/src/bin/e_plane.c
+++ b/src/bin/e_plane.c
@@ -83,36 +83,7 @@ _get_comp_wl_buffer(E_Client *ec)
 static tbm_surface_queue_h
 _get_tbm_surface_queue(E_Comp *e_comp)
 {
-   const char* name;
-   tbm_surface_queue_h tbm_queue = NULL;
-
-   name = ecore_evas_engine_name_get(e_comp->ee);
-   EINA_SAFETY_ON_NULL_RETURN_VAL(name, NULL);
-
-   if (!strcmp(name, "gl_drm"))
-     {
-        Evas_Engine_Info_GL_Drm *info;
-        info = (Evas_Engine_Info_GL_Drm *)evas_engine_info_get(e_comp->evas);
-        EINA_SAFETY_ON_NULL_RETURN_VAL(info, NULL);
-        EINA_SAFETY_ON_NULL_RETURN_VAL(info->info.surface, NULL);
-        tbm_queue = gbm_tbm_get_surface_queue(info->info.surface);
-     }
-   else if(!strcmp(name, "gl_drm_tbm"))
-     {
-        Evas_Engine_Info_GL_Tbm *info;
-        info = (Evas_Engine_Info_GL_Tbm *)evas_engine_info_get(e_comp->evas);
-        EINA_SAFETY_ON_NULL_RETURN_VAL(info, NULL);
-        tbm_queue = (tbm_surface_queue_h)info->info.tbm_queue;
-     }
-   else if(!strcmp(name, "drm_tbm"))
-     {
-        Evas_Engine_Info_Software_Tbm *info;
-        info = (Evas_Engine_Info_Software_Tbm *)evas_engine_info_get(e_comp->evas);
-        EINA_SAFETY_ON_NULL_RETURN_VAL(info, NULL);
-        tbm_queue = (tbm_surface_queue_h)info->info.tbm_queue;
-     }
-
-   return tbm_queue;
+   return e_comp->e_comp_screen->tqueue;
 }
 
 static Eina_Bool
@@ -1266,6 +1237,14 @@ e_plane_setup(E_Plane *plane)
      {
         ecore_evas_manual_render_set(e_comp->ee, 1);
      }
+   else if(!strcmp("gl_tbm", name))
+     {
+        ecore_evas_manual_render_set(e_comp->ee, 1);
+     }
+   else if(!strcmp("software_tbm", name))
+     {
+        ecore_evas_manual_render_set(e_comp->ee, 1);
+     }
 
    renderer = e_plane_renderer_new(plane);
    if (!renderer)

diff --git a/src/bin/e_plane_renderer.c b/src/bin/e_plane_renderer.c
index bf5c63f..9c78dee 100644 (file)
--- a/src/bin/e_plane_renderer.c
+++ b/src/bin/e_plane_renderer.c
@@ -83,35 +83,7 @@ _get_wl_buffer(E_Client *ec)
 static tbm_surface_queue_h
 _get_tbm_surface_queue(Ecore_Evas *ee)
 {
-   const char* name;
-   tbm_surface_queue_h tbm_queue = NULL;
-
-   name = ecore_evas_engine_name_get(ee);
-   EINA_SAFETY_ON_NULL_RETURN_VAL(name, NULL);
-
-   if (!strcmp(name, "gl_drm"))
-     {
-        Evas_Engine_Info_GL_Drm *info;
-        info = (Evas_Engine_Info_GL_Drm *)evas_engine_info_get(ecore_evas_get(ee));
-        if (info->info.surface)
-          tbm_queue = gbm_tbm_get_surface_queue(info->info.surface);
-     }
-   else if(!strcmp(name, "gl_drm_tbm"))
-     {
-        Evas_Engine_Info_GL_Tbm *info;
-        info = (Evas_Engine_Info_GL_Tbm *)evas_engine_info_get(ecore_evas_get(ee));
-        EINA_SAFETY_ON_NULL_RETURN_VAL(info, NULL);
-        tbm_queue = (tbm_surface_queue_h)info->info.tbm_queue;
-     }
-   else if(!strcmp(name, "drm_tbm"))
-     {
-        Evas_Engine_Info_Software_Tbm *info;
-        info = (Evas_Engine_Info_Software_Tbm *)evas_engine_info_get(ecore_evas_get(ee));
-        EINA_SAFETY_ON_NULL_RETURN_VAL(info, NULL);
-        tbm_queue = (tbm_surface_queue_h)info->info.tbm_queue;
-     }
-
-   return tbm_queue;
+   return e_comp->e_comp_screen->tqueue;
 }
 
 static void