3 files changed, 37 insertions, 10 deletions

diff --git a/src/lib/evas/canvas/evas_main.c b/src/lib/evas/canvas/evas_main.c
index 8cac669..d713c4a 100644
--- a/src/lib/evas/canvas/evas_main.c
+++ b/src/lib/evas/canvas/evas_main.c
@@ -1038,13 +1038,26 @@ evas_output_method_set(Evas *eo_e, int render_method)
    e->engine.module = em;
    evas_module_ref(em);
    /* get the engine info struct */
-   if (e->engine.func->output_info)
+   if (e->engine.func->info_size)
      {
         Efl_Canvas_Output *output;
         Eina_List *l;
 
         EINA_LIST_FOREACH(e->outputs, l, output)
-          if (!output->info) output->info = e->engine.func->output_info();
+          if (!output->info)
+            {
+               output->info = calloc(1, e->engine.func->info_size);
+               if (!output->info) continue ;
+               output->info->magic = rand();
+               output->info_magic = output->info->magic;
+
+               if (e->engine.func->output_info_setup)
+                 e->engine.func->output_info_setup(output->info);
+          }
+     }
+   else
+     {
+        CRI("Engine not up to date no info size provided.");
      }
 
    // Wayland/drm already handles seats.
diff --git a/src/lib/evas/canvas/evas_out.c b/src/lib/evas/canvas/evas_out.c
index 48bd5df..567ea58 100644
--- a/src/lib/evas/canvas/evas_out.c
+++ b/src/lib/evas/canvas/evas_out.c
@@ -38,11 +38,22 @@ efl_canvas_output_add(Evas *canvas)
 
    // The engine is already initialized, use it
    // right away to setup the info structure
-   if (e->engine.func->output_info)
+   if (e->engine.func->info_size)
      {
-        r->info = e->engine.func->output_info();
+        r->info = calloc(1, e->engine.func->info_size);
+        if (!r->info) goto on_error;
+        r->info->magic = rand();
+        r->info_magic = r->info->magic;
+
+        if (e->engine.func->output_info_setup)
+          e->engine.func->output_info_setup(r->info);
+     }
+   else
+     {
+        CRI("Engine not up to date no info size provided.");
      }
 
+ on_error:
    return r;
 }
 
@@ -62,7 +73,8 @@ efl_canvas_output_del(Efl_Canvas_Output *output)
                                            output->ector);
              e->engine.func->output_free(_evas_engine_context(e),
                                          output->output);
-             e->engine.func->output_info_free(output->info);
+             free(output->info);
+             output->info = NULL;
           }
         e->outputs = eina_list_remove(e->outputs, output);
 
diff --git a/src/lib/evas/include/evas_private.h b/src/lib/evas/include/evas_private.h
index 0e71d31..ba6b752 100644
--- a/src/lib/evas/include/evas_private.h
+++ b/src/lib/evas/include/evas_private.h
@@ -1334,7 +1334,8 @@ struct _Efl_Canvas_Output
 
    Ector_Surface *ector;
 
-   void *info, *output;
+   Evas_Engine_Info *info;
+   void *output;
    Evas_Coord x, y, w, h;
 
    int info_magic;
@@ -1393,10 +1394,9 @@ struct _Evas_Object_Func
 
 struct _Evas_Func
 {
-   void *(*output_info)                           (void);
-   void (*output_info_free)                       (void *info);
-   void *(*output_setup)                          (void *engine, void *info, unsigned int w, unsigned int h);
-   int  (*output_update)                          (void *engine, void *data, void *info, unsigned int w, unsigned int h);
+   void (*output_info_setup)               (void *info);
+   void *(*output_setup)                   (void *engine, void *info, unsigned int w, unsigned int h);
+   int  (*output_update)                   (void *engine, void *data, void *info, unsigned int w, unsigned int h);
 
    void (*output_free)                     (void *engine, void *data);
    void (*output_resize)                   (void *engine, void *data, int w, int h);
@@ -1616,6 +1616,8 @@ struct _Evas_Func
 
    Evas_Filter_Support (*gfx_filter_supports) (void *engine, Evas_Filter_Command *cmd);
    Eina_Bool (*gfx_filter_process)       (void *engine, Evas_Filter_Command *cmd);
+
+   unsigned int info_size;
 };
 
 struct _Evas_Image_Save_Func