forked from enlightenment/efl
evas/gl - share the evas gl engine for windows properly.
Now elementary_test glview will be happy. SVN revision: 78707
This commit is contained in:
parent
1441df778c
commit
923bc3449b
|
@ -1028,6 +1028,8 @@ evgl_engine_create(EVGL_Interface *efunc, void *engine_data)
|
||||||
int direct_off = 0, debug_mode = 0;
|
int direct_off = 0, debug_mode = 0;
|
||||||
char *s = NULL;
|
char *s = NULL;
|
||||||
|
|
||||||
|
if (evgl_engine) return evgl_engine;
|
||||||
|
|
||||||
// Initialize Log Domain
|
// Initialize Log Domain
|
||||||
if (_evas_gl_log_dom < 0)
|
if (_evas_gl_log_dom < 0)
|
||||||
_evas_gl_log_dom = eina_log_domain_register("EvasGL", EVAS_DEFAULT_LOG_COLOR);
|
_evas_gl_log_dom = eina_log_domain_register("EvasGL", EVAS_DEFAULT_LOG_COLOR);
|
||||||
|
|
|
@ -678,10 +678,13 @@ eng_setup(Evas *eo_e, void *in)
|
||||||
e->engine.data.output = re;
|
e->engine.data.output = re;
|
||||||
gl_wins++;
|
gl_wins++;
|
||||||
|
|
||||||
|
re->evgl_engine = evgl_engine_create(&evgl_funcs, (void*)re);
|
||||||
|
if (!re->evgl_engine)
|
||||||
|
ERR("Error Creating Evas_GL Engine. Evas GL will not be supported!");
|
||||||
|
|
||||||
if (!initted)
|
if (!initted)
|
||||||
{
|
{
|
||||||
evas_common_cpu_init();
|
evas_common_cpu_init();
|
||||||
|
|
||||||
evas_common_blend_init();
|
evas_common_blend_init();
|
||||||
evas_common_image_init();
|
evas_common_image_init();
|
||||||
evas_common_convert_init();
|
evas_common_convert_init();
|
||||||
|
@ -692,14 +695,6 @@ eng_setup(Evas *eo_e, void *in)
|
||||||
evas_common_font_init();
|
evas_common_font_init();
|
||||||
evas_common_draw_init();
|
evas_common_draw_init();
|
||||||
evas_common_tilebuf_init();
|
evas_common_tilebuf_init();
|
||||||
|
|
||||||
re->evgl_engine = evgl_engine_create(&evgl_funcs, (void*)re);
|
|
||||||
|
|
||||||
if (!re->evgl_engine)
|
|
||||||
{
|
|
||||||
ERR("Error Creating Evas_GL Engine. Evas GL will not be supported!");
|
|
||||||
}
|
|
||||||
|
|
||||||
initted = 1;
|
initted = 1;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -2657,7 +2652,6 @@ eng_gl_context_create(void *data, void *share_context)
|
||||||
{
|
{
|
||||||
Render_Engine *re = (Render_Engine *)data;
|
Render_Engine *re = (Render_Engine *)data;
|
||||||
EVGL_Context *sctx = (EVGL_Context *)share_context;
|
EVGL_Context *sctx = (EVGL_Context *)share_context;
|
||||||
|
|
||||||
return evgl_context_create(re->evgl_engine, sctx);
|
return evgl_context_create(re->evgl_engine, sctx);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue