summaryrefslogtreecommitdiff
path: root/src/modules
diff options
context:
space:
mode:
authorCedric BAIL <cedric@osg.samsung.com>2017-08-25 10:51:47 -0700
committerCedric BAIL <cedric@osg.samsung.com>2017-08-25 10:51:47 -0700
commitf3f6a7e535bd3338482c462a14f7d43f469fc85c (patch)
tree20150ef83bfd2d7762bd1c8d9902aff56e80cf01 /src/modules
parentbf0ad88144d034c2661187df7f59b44acdc7ef45 (diff)
evas: make Evas_GL start to use engine and output separately.
Diffstat (limited to 'src/modules')
-rw-r--r--src/modules/evas/engines/gl_generic/evas_engine.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/modules/evas/engines/gl_generic/evas_engine.c b/src/modules/evas/engines/gl_generic/evas_engine.c
index 93932ec..2b3f1f4 100644
--- a/src/modules/evas/engines/gl_generic/evas_engine.c
+++ b/src/modules/evas/engines/gl_generic/evas_engine.c
@@ -1553,7 +1553,7 @@ eng_gl_make_current(void *engine, void *surface, void *context)
1553 { 1553 {
1554 Evas_Engine_GL_Context *gl_context; 1554 Evas_Engine_GL_Context *gl_context;
1555 1555
1556 gl_context = gl_generic_context_get(engine); 1556 gl_context = gl_generic_context_find(engine);
1557 if ((gl_context->havestuff) || 1557 if ((gl_context->havestuff) ||
1558 (gl_context->master_clip.used)) 1558 (gl_context->master_clip.used))
1559 { 1559 {
@@ -1637,7 +1637,7 @@ eng_gl_api_get(void *engine, int version)
1637 Evas_Engine_GL_Context *gl_context; 1637 Evas_Engine_GL_Context *gl_context;
1638 EVGLINIT(engine, NULL); 1638 EVGLINIT(engine, NULL);
1639 1639
1640 gl_context = gl_generic_context_get(engine); 1640 gl_context = gl_generic_context_find(engine);
1641 if (!gl_context) 1641 if (!gl_context)
1642 { 1642 {
1643 ERR("Invalid context!"); 1643 ERR("Invalid context!");
@@ -1666,9 +1666,9 @@ eng_gl_direct_override_get(void *engine, Eina_Bool *override, Eina_Bool *force_o
1666} 1666}
1667 1667
1668static Eina_Bool 1668static Eina_Bool
1669eng_gl_surface_direct_renderable_get(void *engine, Evas_Native_Surface *ns, Eina_Bool *override, void *surface) 1669eng_gl_surface_direct_renderable_get(void *engine, void *output, Evas_Native_Surface *ns, Eina_Bool *override, void *surface)
1670{ 1670{
1671 Render_Output_GL_Generic *re = engine; 1671 Render_Output_GL_Generic *re = output;
1672 Eina_Bool direct_render, client_side_rotation; 1672 Eina_Bool direct_render, client_side_rotation;
1673 Evas_Engine_GL_Context *gl_context; 1673 Evas_Engine_GL_Context *gl_context;
1674 Evas_GL_Image *sfc = surface; 1674 Evas_GL_Image *sfc = surface;