dimmus
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

evas-gl_cocoa: fix complete b0rkage of the engine 

73b308fb66 slaughtered the gl_cocoa
engine. It's now back to life, lighter and shinier.
This commit is contained in:
Jean Guyomarc'h 2016-12-08 20:50:27 +01:00
parent 8ebf4cd972
commit 42a722be23
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/modules/evas/engines/gl_cocoa/evas_engine.c
View File

@ -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;

1
src/modules/evas/engines/gl_cocoa/evas_engine.h
View File

@ -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*