summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@osg.samsung.com>2015-11-07 12:23:04 -0500
committerMike Blumenkrantz <zmike@osg.samsung.com>2015-11-07 12:23:04 -0500
commit4250a148614d495bf5b3bdfccf3eef5a5c8835c7 (patch)
tree1cb786fe64901d588b610386f6deec8433e0f65a
parent7bedc8eea6aced87aafeb1f6bd64cf46137002c0 (diff)
set e_comp->gl for wayland compositors based on gl display bind success
-rw-r--r--src/bin/e_comp_wl.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/bin/e_comp_wl.c b/src/bin/e_comp_wl.c
index 95b5732ed..7e1a61a44 100644
--- a/src/bin/e_comp_wl.c
+++ b/src/bin/e_comp_wl.c
@@ -2661,15 +2661,14 @@ static void
2661_e_comp_wl_gl_init(void *d EINA_UNUSED) 2661_e_comp_wl_gl_init(void *d EINA_UNUSED)
2662{ 2662{
2663 e_comp_wl->wl.gl = evas_gl_new(e_comp->evas); 2663 e_comp_wl->wl.gl = evas_gl_new(e_comp->evas);
2664 e_comp->gl = !!e_comp_wl->wl.gl; 2664 if (!e_comp_wl->wl.gl) return;
2665 if (!e_comp->gl) return;
2666 e_comp_wl->wl.glctx = evas_gl_context_create(e_comp_wl->wl.gl, NULL); 2665 e_comp_wl->wl.glctx = evas_gl_context_create(e_comp_wl->wl.gl, NULL);
2667 e_comp_wl->wl.glcfg = evas_gl_config_new(); 2666 e_comp_wl->wl.glcfg = evas_gl_config_new();
2668 e_comp_wl->wl.glsfc = evas_gl_surface_create(e_comp_wl->wl.gl, e_comp_wl->wl.glcfg, 1, 1); 2667 e_comp_wl->wl.glsfc = evas_gl_surface_create(e_comp_wl->wl.gl, e_comp_wl->wl.glcfg, 1, 1);
2669 evas_gl_make_current(e_comp_wl->wl.gl, e_comp_wl->wl.glsfc, e_comp_wl->wl.glctx); 2668 evas_gl_make_current(e_comp_wl->wl.gl, e_comp_wl->wl.glsfc, e_comp_wl->wl.glctx);
2670 e_comp_wl->wl.glapi = evas_gl_context_api_get(e_comp_wl->wl.gl, e_comp_wl->wl.glctx); 2669 e_comp_wl->wl.glapi = evas_gl_context_api_get(e_comp_wl->wl.gl, e_comp_wl->wl.glctx);
2671 if (e_comp_wl->wl.glapi->evasglBindWaylandDisplay) 2670 if (e_comp_wl->wl.glapi->evasglBindWaylandDisplay)
2672 e_comp_wl->wl.glapi->evasglBindWaylandDisplay(e_comp_wl->wl.gl, e_comp_wl->wl.disp); 2671 e_comp->gl = e_comp_wl->wl.glapi->evasglBindWaylandDisplay(e_comp_wl->wl.gl, e_comp_wl->wl.disp);
2673 else 2672 else
2674 _e_comp_wl_gl_shutdown(); 2673 _e_comp_wl_gl_shutdown();
2675} 2674}