summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCedric BAIL <cedric@osg.samsung.com>2017-08-25 10:51:44 -0700
committerCedric BAIL <cedric@osg.samsung.com>2017-08-25 10:51:44 -0700
commitbf0ad88144d034c2661187df7f59b44acdc7ef45 (patch)
tree12f718a598ca89b866d601774931ea772963aab3
parent46767819fdfeafeacbfa816bcf66a8e231730ee8 (diff)
evas: convert Evas3D use of output to engine when meaningful.
-rw-r--r--src/modules/evas/engines/gl_generic/evas_engine.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/modules/evas/engines/gl_generic/evas_engine.c b/src/modules/evas/engines/gl_generic/evas_engine.c
index 56f49392e0..93932ec4ff 100644
--- a/src/modules/evas/engines/gl_generic/evas_engine.c
+++ b/src/modules/evas/engines/gl_generic/evas_engine.c
@@ -2240,9 +2240,9 @@ eng_context_dup(void *engine EINA_UNUSED, void *context)
2240} 2240}
2241 2241
2242static void 2242static void
2243eng_context_3d_use(void *engine) 2243eng_context_3d_use(void *output)
2244{ 2244{
2245 Render_Output_GL_Generic *re = engine; 2245 Render_Output_GL_Generic *re = output;
2246 2246
2247 if (!re->context_3d) 2247 if (!re->context_3d)
2248 re->context_3d = re->window_gl_context_new(re->software.ob); 2248 re->context_3d = re->window_gl_context_new(re->software.ob);
@@ -2250,9 +2250,9 @@ eng_context_3d_use(void *engine)
2250} 2250}
2251 2251
2252static E3D_Renderer * 2252static E3D_Renderer *
2253eng_renderer_3d_get(void *engine) 2253eng_renderer_3d_get(void *output)
2254{ 2254{
2255 Render_Output_GL_Generic *re = engine; 2255 Render_Output_GL_Generic *re = output;
2256 2256
2257 if (!re->renderer_3d) 2257 if (!re->renderer_3d)
2258 re->renderer_3d = e3d_renderer_new(); 2258 re->renderer_3d = e3d_renderer_new();
@@ -2305,16 +2305,16 @@ eng_image_drawable_set(void *engine, void *image, void *drawable)
2305} 2305}
2306 2306
2307static void 2307static void
2308eng_drawable_scene_render(void *engine, void *data EINA_UNUSED, void *drawable, void *scene_data) 2308eng_drawable_scene_render(void *engine EINA_UNUSED, void *data, void *drawable, void *scene_data)
2309{ 2309{
2310 Evas_Engine_GL_Context *gl_context; 2310 Evas_Engine_GL_Context *gl_context;
2311 E3D_Renderer *renderer = NULL; 2311 E3D_Renderer *renderer = NULL;
2312 2312
2313 gl_context = gl_generic_context_get(engine); 2313 gl_context = gl_generic_context_get(data);
2314 evas_gl_common_context_flush(gl_context); 2314 evas_gl_common_context_flush(gl_context);
2315 2315
2316 eng_context_3d_use(engine); 2316 eng_context_3d_use(data);
2317 renderer = eng_renderer_3d_get(engine); 2317 renderer = eng_renderer_3d_get(data);
2318 e3d_drawable_scene_render(drawable, renderer, scene_data); 2318 e3d_drawable_scene_render(drawable, renderer, scene_data);
2319} 2319}
2320 2320