summaryrefslogtreecommitdiff
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
parentbf0ad88144d034c2661187df7f59b44acdc7ef45 (diff)
evas: make Evas_GL start to use engine and output separately.
-rw-r--r--src/lib/evas/canvas/evas_object_image.c4
-rw-r--r--src/lib/evas/include/evas_private.h2
-rw-r--r--src/modules/evas/engines/gl_generic/evas_engine.c8
3 files changed, 7 insertions, 7 deletions
diff --git a/src/lib/evas/canvas/evas_object_image.c b/src/lib/evas/canvas/evas_object_image.c
index 1ba3971a7a..9db54b42ec 100644
--- a/src/lib/evas/canvas/evas_object_image.c
+++ b/src/lib/evas/canvas/evas_object_image.c
@@ -1604,7 +1604,7 @@ evas_process_dirty_pixels(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj,
1604 if (ENFN->gl_direct_override_get) 1604 if (ENFN->gl_direct_override_get)
1605 ENFN->gl_direct_override_get(engine, &direct_override, &direct_force_off); 1605 ENFN->gl_direct_override_get(engine, &direct_override, &direct_force_off);
1606 if (ENFN->gl_surface_direct_renderable_get) 1606 if (ENFN->gl_surface_direct_renderable_get)
1607 direct_renderable = ENFN->gl_surface_direct_renderable_get(engine, ns, &direct_override, surface); 1607 direct_renderable = ENFN->gl_surface_direct_renderable_get(engine, output, ns, &direct_override, surface);
1608 1608
1609 if (((direct_override) || 1609 if (((direct_override) ||
1610 ((direct_renderable) && 1610 ((direct_renderable) &&
@@ -1677,7 +1677,7 @@ evas_process_dirty_pixels(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj,
1677 if (ENFN->gl_direct_override_get) 1677 if (ENFN->gl_direct_override_get)
1678 ENFN->gl_direct_override_get(engine, &direct_override, &direct_force_off); 1678 ENFN->gl_direct_override_get(engine, &direct_override, &direct_force_off);
1679 if (ENFN->gl_surface_direct_renderable_get) 1679 if (ENFN->gl_surface_direct_renderable_get)
1680 ENFN->gl_surface_direct_renderable_get(engine, ns, &direct_override, surface); 1680 ENFN->gl_surface_direct_renderable_get(engine, output, ns, &direct_override, surface);
1681 1681
1682 if (direct_override && !direct_force_off) 1682 if (direct_override && !direct_force_off)
1683 { 1683 {
diff --git a/src/lib/evas/include/evas_private.h b/src/lib/evas/include/evas_private.h
index 74ef28d84a..c01eb0dc3c 100644
--- a/src/lib/evas/include/evas_private.h
+++ b/src/lib/evas/include/evas_private.h
@@ -1561,7 +1561,7 @@ struct _Evas_Func
1561 void *(*gl_current_surface_get) (void *engine); 1561 void *(*gl_current_surface_get) (void *engine);
1562 int (*gl_rotation_angle_get) (void *engine); 1562 int (*gl_rotation_angle_get) (void *engine);
1563 Eina_Bool (*gl_surface_query) (void *engine, void *surface, int attr, void *value); 1563 Eina_Bool (*gl_surface_query) (void *engine, void *surface, int attr, void *value);
1564 Eina_Bool (*gl_surface_direct_renderable_get) (void *engine, Evas_Native_Surface *ns, Eina_Bool *override, void *surface); 1564 Eina_Bool (*gl_surface_direct_renderable_get) (void *engine, void *output, Evas_Native_Surface *ns, Eina_Bool *override, void *surface);
1565 void (*gl_image_direct_set) (void *engine, void *image, Eina_Bool direct); 1565 void (*gl_image_direct_set) (void *engine, void *image, Eina_Bool direct);
1566 int (*gl_image_direct_get) (void *engine, void *image); 1566 int (*gl_image_direct_get) (void *engine, void *image);
1567 void (*gl_get_pixels_pre) (void *engine); 1567 void (*gl_get_pixels_pre) (void *engine);
diff --git a/src/modules/evas/engines/gl_generic/evas_engine.c b/src/modules/evas/engines/gl_generic/evas_engine.c
index 93932ec4ff..2b3f1f4c88 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;