evas-gl_cocoa: fix complete b0rkage of the engine

73b308fb66f871b93ef8e324997872e3bf175906 slaughtered the gl_cocoa
engine. It's now back to life, lighter and shinier.

diff --git a/src/modules/evas/engines/gl_cocoa/evas_engine.c b/src/modules/evas/engines/gl_cocoa/evas_engine.c
index 616525c6f20cd0b3fb2734c054437efc3033438e..6b480e6fd878dc129025e944f01ff60ef96e2d46 100644 (file)
--- a/src/modules/evas/engines/gl_cocoa/evas_engine.c
+++ b/src/modules/evas/engines/gl_cocoa/evas_engine.c
@@ -149,7 +149,7 @@ eng_info_free(Evas *e EINA_UNUSED, void *info)
 }
 
 static void *
-eng_setup(void *in, unsigned int w, unsinged int h)
+eng_setup(void *in, unsigned int w, unsigned int h)
 {
    Evas_Engine_Info_GL_Cocoa *const info = in;
    Render_Engine *re;
@@ -178,7 +178,6 @@ eng_setup(void *in, unsigned int w, unsinged int h)
         goto err;
      }
 
-   ob->evas = evas;
    info->view = ob->ns_gl_view;
 
    chk = evas_render_engine_gl_generic_init(&re->generic, ob,
@@ -210,15 +209,21 @@ eng_setup(void *in, unsigned int w, unsinged int h)
    _gl_wins++;
 
    evas_outbuf_use(re->win);
+   return re;
 
+err:
+   free(re);
    return NULL;
 }
 
 static int
-eng_update(void *data, void *info, unsigned int w, unsigned int h)
+eng_update(void         *data EINA_UNUSED,
+           void         *info EINA_UNUSED,
+           unsigned int  w    EINA_UNUSED,
+           unsigned int  h    EINA_UNUSED)
 {
-   Evas_Engine_Info_GL_Cocoa *const info = in;
-   Render_Engine *re = data;
+   //Evas_Engine_Info_GL_Cocoa *const info = info;
+   //Render_Engine *re = data;
 
    CRI("ALREADY A DATA OUTPUT. THIS PART IS NOT IMPLEMENTED YET. PLEASE REPORT.");
    return 0;

diff --git a/src/modules/evas/engines/gl_cocoa/evas_engine.h b/src/modules/evas/engines/gl_cocoa/evas_engine.h
index 855e125a6baef33e2d2615a8195dcc6c1665802e..2af2d6adbb91aff7d87f11214459ca41832030f5 100644 (file)
--- a/src/modules/evas/engines/gl_cocoa/evas_engine.h
+++ b/src/modules/evas/engines/gl_cocoa/evas_engine.h
@@ -58,7 +58,6 @@ struct _Outbuf
 {
    Evas_Engine_Info_GL_Cocoa *info;
    Evas_Engine_GL_Context *gl_context;
-   Evas *evas;
 
    void *ns_gl_view; // NSOpenGLView*
    void *ns_window;  // NSWindow*