summaryrefslogtreecommitdiff
path: root/legacy/evas/src
diff options
context:
space:
mode:
authorChunEon Park <hermet@hermet.pe.kr>2012-10-31 12:57:21 +0000
committerChunEon Park <hermet@hermet.pe.kr>2012-10-31 12:57:21 +0000
commit923bc3449b4bcc773684a173e07c9aca9d07b0cc (patch)
tree3a0be5d19f2b0d8511dc934ef28ac7dfd150e56d /legacy/evas/src
parent1441df778c10f6909a8b08f89a9547b29fa3308b (diff)
evas/gl - share the evas gl engine for windows properly.
Now elementary_test glview will be happy. SVN revision: 78707
Diffstat (limited to 'legacy/evas/src')
-rwxr-xr-xlegacy/evas/src/modules/engines/gl_common/evas_gl_core.c2
-rw-r--r--legacy/evas/src/modules/engines/gl_x11/evas_engine.c14
2 files changed, 6 insertions, 10 deletions
diff --git a/legacy/evas/src/modules/engines/gl_common/evas_gl_core.c b/legacy/evas/src/modules/engines/gl_common/evas_gl_core.c
index 6e09b491ef..6019a6a82d 100755
--- a/legacy/evas/src/modules/engines/gl_common/evas_gl_core.c
+++ b/legacy/evas/src/modules/engines/gl_common/evas_gl_core.c
@@ -1028,6 +1028,8 @@ evgl_engine_create(EVGL_Interface *efunc, void *engine_data)
1028 int direct_off = 0, debug_mode = 0; 1028 int direct_off = 0, debug_mode = 0;
1029 char *s = NULL; 1029 char *s = NULL;
1030 1030
1031 if (evgl_engine) return evgl_engine;
1032
1031 // Initialize Log Domain 1033 // Initialize Log Domain
1032 if (_evas_gl_log_dom < 0) 1034 if (_evas_gl_log_dom < 0)
1033 _evas_gl_log_dom = eina_log_domain_register("EvasGL", EVAS_DEFAULT_LOG_COLOR); 1035 _evas_gl_log_dom = eina_log_domain_register("EvasGL", EVAS_DEFAULT_LOG_COLOR);
diff --git a/legacy/evas/src/modules/engines/gl_x11/evas_engine.c b/legacy/evas/src/modules/engines/gl_x11/evas_engine.c
index abff2e9a4a..e9a529d0e3 100644
--- a/legacy/evas/src/modules/engines/gl_x11/evas_engine.c
+++ b/legacy/evas/src/modules/engines/gl_x11/evas_engine.c
@@ -678,10 +678,13 @@ eng_setup(Evas *eo_e, void *in)
678 e->engine.data.output = re; 678 e->engine.data.output = re;
679 gl_wins++; 679 gl_wins++;
680 680
681 re->evgl_engine = evgl_engine_create(&evgl_funcs, (void*)re);
682 if (!re->evgl_engine)
683 ERR("Error Creating Evas_GL Engine. Evas GL will not be supported!");
684
681 if (!initted) 685 if (!initted)
682 { 686 {
683 evas_common_cpu_init(); 687 evas_common_cpu_init();
684
685 evas_common_blend_init(); 688 evas_common_blend_init();
686 evas_common_image_init(); 689 evas_common_image_init();
687 evas_common_convert_init(); 690 evas_common_convert_init();
@@ -692,14 +695,6 @@ eng_setup(Evas *eo_e, void *in)
692 evas_common_font_init(); 695 evas_common_font_init();
693 evas_common_draw_init(); 696 evas_common_draw_init();
694 evas_common_tilebuf_init(); 697 evas_common_tilebuf_init();
695
696 re->evgl_engine = evgl_engine_create(&evgl_funcs, (void*)re);
697
698 if (!re->evgl_engine)
699 {
700 ERR("Error Creating Evas_GL Engine. Evas GL will not be supported!");
701 }
702
703 initted = 1; 698 initted = 1;
704 } 699 }
705 } 700 }
@@ -2657,7 +2652,6 @@ eng_gl_context_create(void *data, void *share_context)
2657{ 2652{
2658 Render_Engine *re = (Render_Engine *)data; 2653 Render_Engine *re = (Render_Engine *)data;
2659 EVGL_Context *sctx = (EVGL_Context *)share_context; 2654 EVGL_Context *sctx = (EVGL_Context *)share_context;
2660
2661 return evgl_context_create(re->evgl_engine, sctx); 2655 return evgl_context_create(re->evgl_engine, sctx);
2662} 2656}
2663 2657