summaryrefslogtreecommitdiff
path: root/src/lib/evas
diff options
context:
space:
mode:
authorCedric BAIL <cedric@osg.samsung.com>2017-08-25 10:48:09 -0700
committerCedric BAIL <cedric@osg.samsung.com>2017-08-25 10:48:09 -0700
commit1e2bbf8feae36fbca083ed030f26fd42d5436c9a (patch)
treeea827184cc009f587dcfb1edfb4496ea78246702 /src/lib/evas
parent8017fab1006e103c7138d72a5e61bba2588a2cd8 (diff)
evas: all this function (info, setup and update) are really output related.
Diffstat (limited to 'src/lib/evas')
-rw-r--r--src/lib/evas/canvas/evas_main.c4
-rw-r--r--src/lib/evas/canvas/evas_out.c16
-rw-r--r--src/lib/evas/include/evas_private.h8
3 files changed, 14 insertions, 14 deletions
diff --git a/src/lib/evas/canvas/evas_main.c b/src/lib/evas/canvas/evas_main.c
index a30a853..8cac669 100644
--- a/src/lib/evas/canvas/evas_main.c
+++ b/src/lib/evas/canvas/evas_main.c
@@ -1038,13 +1038,13 @@ evas_output_method_set(Evas *eo_e, int render_method)
1038 e->engine.module = em; 1038 e->engine.module = em;
1039 evas_module_ref(em); 1039 evas_module_ref(em);
1040 /* get the engine info struct */ 1040 /* get the engine info struct */
1041 if (e->engine.func->info) 1041 if (e->engine.func->output_info)
1042 { 1042 {
1043 Efl_Canvas_Output *output; 1043 Efl_Canvas_Output *output;
1044 Eina_List *l; 1044 Eina_List *l;
1045 1045
1046 EINA_LIST_FOREACH(e->outputs, l, output) 1046 EINA_LIST_FOREACH(e->outputs, l, output)
1047 if (!output->info) output->info = e->engine.func->info(); 1047 if (!output->info) output->info = e->engine.func->output_info();
1048 } 1048 }
1049 1049
1050 // Wayland/drm already handles seats. 1050 // Wayland/drm already handles seats.
diff --git a/src/lib/evas/canvas/evas_out.c b/src/lib/evas/canvas/evas_out.c
index 5310d28..48bd5df 100644
--- a/src/lib/evas/canvas/evas_out.c
+++ b/src/lib/evas/canvas/evas_out.c
@@ -38,9 +38,9 @@ efl_canvas_output_add(Evas *canvas)
38 38
39 // The engine is already initialized, use it 39 // The engine is already initialized, use it
40 // right away to setup the info structure 40 // right away to setup the info structure
41 if (e->engine.func->info) 41 if (e->engine.func->output_info)
42 { 42 {
43 r->info = e->engine.func->info(); 43 r->info = e->engine.func->output_info();
44 } 44 }
45 45
46 return r; 46 return r;
@@ -62,7 +62,7 @@ efl_canvas_output_del(Efl_Canvas_Output *output)
62 output->ector); 62 output->ector);
63 e->engine.func->output_free(_evas_engine_context(e), 63 e->engine.func->output_free(_evas_engine_context(e),
64 output->output); 64 output->output);
65 e->engine.func->info_free(output->info); 65 e->engine.func->output_info_free(output->info);
66 } 66 }
67 e->outputs = eina_list_remove(e->outputs, output); 67 e->outputs = eina_list_remove(e->outputs, output);
68 68
@@ -113,10 +113,10 @@ efl_canvas_output_engine_info_set(Efl_Canvas_Output *output,
113 113
114 if (output->output) 114 if (output->output)
115 { 115 {
116 if (e->engine.func->update) 116 if (e->engine.func->output_update)
117 { 117 {
118 e->engine.func->update(_evas_engine_context(e), output->output, info, 118 e->engine.func->output_update(_evas_engine_context(e), output->output, info,
119 e->output.w, e->output.h); 119 e->output.w, e->output.h);
120 } 120 }
121 else 121 else
122 { 122 {
@@ -136,8 +136,8 @@ efl_canvas_output_engine_info_set(Efl_Canvas_Output *output,
136 } 136 }
137 137
138 setup: 138 setup:
139 output->output = e->engine.func->setup(_evas_engine_context(e), info, 139 output->output = e->engine.func->output_setup(_evas_engine_context(e), info,
140 e->output.w, e->output.h); 140 e->output.w, e->output.h);
141 } 141 }
142 142
143 return !!output->output; 143 return !!output->output;
diff --git a/src/lib/evas/include/evas_private.h b/src/lib/evas/include/evas_private.h
index 4e939da..0e71d31 100644
--- a/src/lib/evas/include/evas_private.h
+++ b/src/lib/evas/include/evas_private.h
@@ -1393,10 +1393,10 @@ struct _Evas_Object_Func
1393 1393
1394struct _Evas_Func 1394struct _Evas_Func
1395{ 1395{
1396 void *(*info) (void); 1396 void *(*output_info) (void);
1397 void (*info_free) (void *info); 1397 void (*output_info_free) (void *info);
1398 void *(*setup) (void *engine, void *info, unsigned int w, unsigned int h); 1398 void *(*output_setup) (void *engine, void *info, unsigned int w, unsigned int h);
1399 int (*update) (void *engine, void *data, void *info, unsigned int w, unsigned int h); 1399 int (*output_update) (void *engine, void *data, void *info, unsigned int w, unsigned int h);
1400 1400
1401 void (*output_free) (void *engine, void *data); 1401 void (*output_free) (void *engine, void *data);
1402 void (*output_resize) (void *engine, void *data, int w, int h); 1402 void (*output_resize) (void *engine, void *data, int w, int h);