summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCedric BAIL <cedric@osg.samsung.com>2017-08-25 10:47:03 -0700
committerCedric BAIL <cedric@osg.samsung.com>2017-08-25 10:47:03 -0700
commit268d9984b4708bb18f9d84bd221a674f09d16048 (patch)
tree05d9c729165f27a2d5c049f51999379d0565de4a
parent4b74a4cd55ffe55ade7afaa5febbd7c5fb839a8e (diff)
evas: engine should not access Evas canvas directly.
-rw-r--r--src/lib/evas/canvas/evas_main.c2
-rw-r--r--src/lib/evas/canvas/evas_out.c4
-rw-r--r--src/lib/evas/include/evas_private.h4
-rw-r--r--src/modules/evas/engines/buffer/evas_engine.c8
-rw-r--r--src/modules/evas/engines/drm/evas_engine.c4
-rw-r--r--src/modules/evas/engines/eglfs/evas_engine.c4
-rw-r--r--src/modules/evas/engines/fb/evas_engine.c4
-rw-r--r--src/modules/evas/engines/gl_cocoa/evas_engine.c4
-rw-r--r--src/modules/evas/engines/gl_drm/evas_engine.c4
-rw-r--r--src/modules/evas/engines/gl_sdl/evas_engine.c4
-rw-r--r--src/modules/evas/engines/gl_x11/evas_engine.c4
-rw-r--r--src/modules/evas/engines/psl1ght/evas_engine.c4
-rw-r--r--src/modules/evas/engines/software_ddraw/evas_engine.c4
-rw-r--r--src/modules/evas/engines/software_gdi/evas_engine.c4
-rw-r--r--src/modules/evas/engines/software_x11/evas_engine.c4
-rw-r--r--src/modules/evas/engines/wayland_egl/evas_engine.c2
-rw-r--r--src/modules/evas/engines/wayland_shm/evas_engine.c6
17 files changed, 35 insertions, 35 deletions
diff --git a/src/lib/evas/canvas/evas_main.c b/src/lib/evas/canvas/evas_main.c
index 114e12fdd5..a30a853f37 100644
--- a/src/lib/evas/canvas/evas_main.c
+++ b/src/lib/evas/canvas/evas_main.c
@@ -1044,7 +1044,7 @@ evas_output_method_set(Evas *eo_e, int render_method)
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 output->info = e->engine.func->info(eo_e); 1047 if (!output->info) output->info = e->engine.func->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 d66fb0f396..5310d28f5c 100644
--- a/src/lib/evas/canvas/evas_out.c
+++ b/src/lib/evas/canvas/evas_out.c
@@ -40,7 +40,7 @@ efl_canvas_output_add(Evas *canvas)
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->info)
42 { 42 {
43 r->info = e->engine.func->info(canvas); 43 r->info = e->engine.func->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->canvas, output->info); 65 e->engine.func->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
diff --git a/src/lib/evas/include/evas_private.h b/src/lib/evas/include/evas_private.h
index af5a08318f..294dfb57b1 100644
--- a/src/lib/evas/include/evas_private.h
+++ b/src/lib/evas/include/evas_private.h
@@ -1393,8 +1393,8 @@ struct _Evas_Object_Func
1393 1393
1394struct _Evas_Func 1394struct _Evas_Func
1395{ 1395{
1396 void *(*info) (Evas *e); 1396 void *(*info) (void);
1397 void (*info_free) (Evas *e, void *info); 1397 void (*info_free) (void *info);
1398 void *(*setup) (void *engine, void *info, unsigned int w, unsigned int h); 1398 void *(*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 (*update) (void *engine, void *data, void *info, unsigned int w, unsigned int h);
1400 1400
diff --git a/src/modules/evas/engines/buffer/evas_engine.c b/src/modules/evas/engines/buffer/evas_engine.c
index 0ad83cfd78..cb5867e85f 100644
--- a/src/modules/evas/engines/buffer/evas_engine.c
+++ b/src/modules/evas/engines/buffer/evas_engine.c
@@ -22,8 +22,8 @@ typedef Render_Engine_Software_Generic Render_Engine;
22/* prototypes we will use here */ 22/* prototypes we will use here */
23static void *_output_setup(int w, int h, void *dest_buffer, int dest_buffer_row_bytes, int depth_type, int use_color_key, int alpha_threshold, int color_key_r, int color_key_g, int color_key_b, void *(*new_update_region) (int x, int y, int w, int h, int *row_bytes), void (*free_update_region) (int x, int y, int w, int h, void *data), void *(*switch_buffer) (void *data, void *dest_buffer), void *switch_data); 23static void *_output_setup(int w, int h, void *dest_buffer, int dest_buffer_row_bytes, int depth_type, int use_color_key, int alpha_threshold, int color_key_r, int color_key_g, int color_key_b, void *(*new_update_region) (int x, int y, int w, int h, int *row_bytes), void (*free_update_region) (int x, int y, int w, int h, void *data), void *(*switch_buffer) (void *data, void *dest_buffer), void *switch_data);
24 24
25static void *eng_info(Evas *eo_e EINA_UNUSED); 25static void *eng_info(void);
26static void eng_info_free(Evas *eo_e EINA_UNUSED, void *info); 26static void eng_info_free(void *info);
27static void eng_output_free(void *engine EINA_UNUSED, void *data); 27static void eng_output_free(void *engine EINA_UNUSED, void *data);
28 28
29/* internal engine routines */ 29/* internal engine routines */
@@ -108,7 +108,7 @@ _output_setup(int w,
108 108
109/* engine api this module provides */ 109/* engine api this module provides */
110static void * 110static void *
111eng_info(Evas *eo_e EINA_UNUSED) 111eng_info(void)
112{ 112{
113 Evas_Engine_Info_Buffer *info; 113 Evas_Engine_Info_Buffer *info;
114 info = calloc(1, sizeof(Evas_Engine_Info_Buffer)); 114 info = calloc(1, sizeof(Evas_Engine_Info_Buffer));
@@ -119,7 +119,7 @@ eng_info(Evas *eo_e EINA_UNUSED)
119} 119}
120 120
121static void 121static void
122eng_info_free(Evas *eo_e EINA_UNUSED, void *info) 122eng_info_free(void *info)
123{ 123{
124 Evas_Engine_Info_Buffer *in; 124 Evas_Engine_Info_Buffer *in;
125 in = (Evas_Engine_Info_Buffer *)info; 125 in = (Evas_Engine_Info_Buffer *)info;
diff --git a/src/modules/evas/engines/drm/evas_engine.c b/src/modules/evas/engines/drm/evas_engine.c
index 7d01407c8f..77c183bdba 100644
--- a/src/modules/evas/engines/drm/evas_engine.c
+++ b/src/modules/evas/engines/drm/evas_engine.c
@@ -58,7 +58,7 @@ err:
58} 58}
59 59
60static void * 60static void *
61eng_info(Evas *evas EINA_UNUSED) 61eng_info(void)
62{ 62{
63 Evas_Engine_Info_Drm *info; 63 Evas_Engine_Info_Drm *info;
64 64
@@ -74,7 +74,7 @@ eng_info(Evas *evas EINA_UNUSED)
74} 74}
75 75
76static void 76static void
77eng_info_free(Evas *evas EINA_UNUSED, void *einfo) 77eng_info_free(void *einfo)
78{ 78{
79 Evas_Engine_Info_Drm *info; 79 Evas_Engine_Info_Drm *info;
80 80
diff --git a/src/modules/evas/engines/eglfs/evas_engine.c b/src/modules/evas/engines/eglfs/evas_engine.c
index d6a714be26..f4813ecd17 100644
--- a/src/modules/evas/engines/eglfs/evas_engine.c
+++ b/src/modules/evas/engines/eglfs/evas_engine.c
@@ -671,7 +671,7 @@ _native_cb_free(void *image)
671 671
672/* engine specific override functions */ 672/* engine specific override functions */
673static void * 673static void *
674eng_info(Evas *eo_e EINA_UNUSED) 674eng_info(void)
675{ 675{
676 Evas_Engine_Info_Eglfs *info; 676 Evas_Engine_Info_Eglfs *info;
677 677
@@ -686,7 +686,7 @@ eng_info(Evas *eo_e EINA_UNUSED)
686} 686}
687 687
688static void 688static void
689eng_info_free(Evas *eo_e EINA_UNUSED, void *in) 689eng_info_free(void *in)
690{ 690{
691 Evas_Engine_Info_Eglfs *info; 691 Evas_Engine_Info_Eglfs *info;
692 692
diff --git a/src/modules/evas/engines/fb/evas_engine.c b/src/modules/evas/engines/fb/evas_engine.c
index 6fb6c9458f..fa1125a235 100644
--- a/src/modules/evas/engines/fb/evas_engine.c
+++ b/src/modules/evas/engines/fb/evas_engine.c
@@ -62,7 +62,7 @@ _output_setup(int w, int h, int rot, int vt, int dev, int refresh)
62 62
63/* engine api this module provides */ 63/* engine api this module provides */
64static void * 64static void *
65eng_info(Evas *eo_e EINA_UNUSED) 65eng_info(void)
66{ 66{
67 Evas_Engine_Info_FB *info; 67 Evas_Engine_Info_FB *info;
68 info = calloc(1, sizeof(Evas_Engine_Info_FB)); 68 info = calloc(1, sizeof(Evas_Engine_Info_FB));
@@ -73,7 +73,7 @@ eng_info(Evas *eo_e EINA_UNUSED)
73} 73}
74 74
75static void 75static void
76eng_info_free(Evas *eo_e EINA_UNUSED, void *info) 76eng_info_free(void *info)
77{ 77{
78 Evas_Engine_Info_FB *in; 78 Evas_Engine_Info_FB *in;
79 in = (Evas_Engine_Info_FB *)info; 79 in = (Evas_Engine_Info_FB *)info;
diff --git a/src/modules/evas/engines/gl_cocoa/evas_engine.c b/src/modules/evas/engines/gl_cocoa/evas_engine.c
index 4ae938c6e7..5a6be9b5f5 100644
--- a/src/modules/evas/engines/gl_cocoa/evas_engine.c
+++ b/src/modules/evas/engines/gl_cocoa/evas_engine.c
@@ -127,7 +127,7 @@ static const EVGL_Interface evgl_funcs =
127 127
128 128
129static void * 129static void *
130eng_info(Evas *e EINA_UNUSED) 130eng_info(void)
131{ 131{
132 Evas_Engine_Info_GL_Cocoa *info; 132 Evas_Engine_Info_GL_Cocoa *info;
133 133
@@ -142,7 +142,7 @@ eng_info(Evas *e EINA_UNUSED)
142} 142}
143 143
144static void 144static void
145eng_info_free(Evas *e EINA_UNUSED, void *info) 145eng_info_free(void *info)
146{ 146{
147 Evas_Engine_Info_GL_Cocoa *const in = info; 147 Evas_Engine_Info_GL_Cocoa *const in = info;
148 free(in); 148 free(in);
diff --git a/src/modules/evas/engines/gl_drm/evas_engine.c b/src/modules/evas/engines/gl_drm/evas_engine.c
index f4dbed8494..0b0b191a10 100644
--- a/src/modules/evas/engines/gl_drm/evas_engine.c
+++ b/src/modules/evas/engines/gl_drm/evas_engine.c
@@ -892,7 +892,7 @@ _native_cb_free(void *image)
892 892
893/* engine specific override functions */ 893/* engine specific override functions */
894static void * 894static void *
895eng_info(Evas *eo_e EINA_UNUSED) 895eng_info(void)
896{ 896{
897 Evas_Engine_Info_GL_Drm *info; 897 Evas_Engine_Info_GL_Drm *info;
898 898
@@ -907,7 +907,7 @@ eng_info(Evas *eo_e EINA_UNUSED)
907} 907}
908 908
909static void 909static void
910eng_info_free(Evas *eo_e EINA_UNUSED, void *in) 910eng_info_free(void *in)
911{ 911{
912 Evas_Engine_Info_GL_Drm *info; 912 Evas_Engine_Info_GL_Drm *info;
913 913
diff --git a/src/modules/evas/engines/gl_sdl/evas_engine.c b/src/modules/evas/engines/gl_sdl/evas_engine.c
index ecf9e52d25..951f346aec 100644
--- a/src/modules/evas/engines/gl_sdl/evas_engine.c
+++ b/src/modules/evas/engines/gl_sdl/evas_engine.c
@@ -268,7 +268,7 @@ static const EVGL_Interface evgl_funcs =
268 268
269 269
270static void * 270static void *
271eng_info(Evas *e EINA_UNUSED) 271eng_info(void)
272{ 272{
273 Evas_Engine_Info_GL_SDL *info; 273 Evas_Engine_Info_GL_SDL *info;
274 274
@@ -279,7 +279,7 @@ eng_info(Evas *e EINA_UNUSED)
279} 279}
280 280
281static void 281static void
282eng_info_free(Evas *e EINA_UNUSED, void *info) 282eng_info_free(void *info)
283{ 283{
284 Evas_Engine_Info_GL_SDL *in; 284 Evas_Engine_Info_GL_SDL *in;
285 in = (Evas_Engine_Info_GL_SDL *)info; 285 in = (Evas_Engine_Info_GL_SDL *)info;
diff --git a/src/modules/evas/engines/gl_x11/evas_engine.c b/src/modules/evas/engines/gl_x11/evas_engine.c
index 27b74ebb5d..e07c470c50 100644
--- a/src/modules/evas/engines/gl_x11/evas_engine.c
+++ b/src/modules/evas/engines/gl_x11/evas_engine.c
@@ -1550,7 +1550,7 @@ int _evas_engine_GL_X11_log_dom = -1;
1550static Evas_Func func, pfunc; 1550static Evas_Func func, pfunc;
1551 1551
1552static void * 1552static void *
1553eng_info(Evas *eo_e EINA_UNUSED) 1553eng_info(void)
1554{ 1554{
1555 Evas_Engine_Info_GL_X11 *info; 1555 Evas_Engine_Info_GL_X11 *info;
1556 1556
@@ -1564,7 +1564,7 @@ eng_info(Evas *eo_e EINA_UNUSED)
1564} 1564}
1565 1565
1566static void 1566static void
1567eng_info_free(Evas *eo_e EINA_UNUSED, void *info) 1567eng_info_free(void *info)
1568{ 1568{
1569 Evas_Engine_Info_GL_X11 *in; 1569 Evas_Engine_Info_GL_X11 *in;
1570// dont free! why bother? its not worth it 1570// dont free! why bother? its not worth it
diff --git a/src/modules/evas/engines/psl1ght/evas_engine.c b/src/modules/evas/engines/psl1ght/evas_engine.c
index b22d3f2d95..5c9abd2ecf 100644
--- a/src/modules/evas/engines/psl1ght/evas_engine.c
+++ b/src/modules/evas/engines/psl1ght/evas_engine.c
@@ -99,7 +99,7 @@ _output_setup(int w, int h)
99 99
100/* engine api this module provides */ 100/* engine api this module provides */
101static void * 101static void *
102eng_info(Evas *e) 102eng_info(void)
103{ 103{
104 Evas_Engine_Info_PSL1GHT *info; 104 Evas_Engine_Info_PSL1GHT *info;
105 105
@@ -115,7 +115,7 @@ eng_info(Evas *e)
115} 115}
116 116
117static void 117static void
118eng_info_free(Evas *e EINA_UNUSED, void *info) 118eng_info_free(void *info)
119{ 119{
120 Evas_Engine_Info_PSL1GHT *in; 120 Evas_Engine_Info_PSL1GHT *in;
121 121
diff --git a/src/modules/evas/engines/software_ddraw/evas_engine.c b/src/modules/evas/engines/software_ddraw/evas_engine.c
index 7772320b2f..cdb0aa6dc9 100644
--- a/src/modules/evas/engines/software_ddraw/evas_engine.c
+++ b/src/modules/evas/engines/software_ddraw/evas_engine.c
@@ -67,7 +67,7 @@ _output_setup(int width,
67/* engine api this module provides */ 67/* engine api this module provides */
68 68
69static void * 69static void *
70eng_info(Evas *e EINA_UNUSED) 70eng_info(void)
71{ 71{
72 Evas_Engine_Info_Software_DDraw *info; 72 Evas_Engine_Info_Software_DDraw *info;
73 73
@@ -79,7 +79,7 @@ eng_info(Evas *e EINA_UNUSED)
79} 79}
80 80
81static void 81static void
82eng_info_free(Evas *e EINA_UNUSED, void *info) 82eng_info_free(void *info)
83{ 83{
84 Evas_Engine_Info_Software_DDraw *in; 84 Evas_Engine_Info_Software_DDraw *in;
85 85
diff --git a/src/modules/evas/engines/software_gdi/evas_engine.c b/src/modules/evas/engines/software_gdi/evas_engine.c
index 555862a666..34d9a23fb9 100644
--- a/src/modules/evas/engines/software_gdi/evas_engine.c
+++ b/src/modules/evas/engines/software_gdi/evas_engine.c
@@ -73,7 +73,7 @@ _output_setup(int width,
73/* engine api this module provides */ 73/* engine api this module provides */
74 74
75static void * 75static void *
76eng_info(Evas *e EINA_UNUSED) 76eng_info(void)
77{ 77{
78 Evas_Engine_Info_Software_Gdi *info; 78 Evas_Engine_Info_Software_Gdi *info;
79 info = calloc(1, sizeof(Evas_Engine_Info_Software_Gdi)); 79 info = calloc(1, sizeof(Evas_Engine_Info_Software_Gdi));
@@ -83,7 +83,7 @@ eng_info(Evas *e EINA_UNUSED)
83} 83}
84 84
85static void 85static void
86eng_info_free(Evas *e EINA_UNUSED, void *info) 86eng_info_free(void *info)
87{ 87{
88 Evas_Engine_Info_Software_Gdi *in; 88 Evas_Engine_Info_Software_Gdi *in;
89 in = (Evas_Engine_Info_Software_Gdi *)info; 89 in = (Evas_Engine_Info_Software_Gdi *)info;
diff --git a/src/modules/evas/engines/software_x11/evas_engine.c b/src/modules/evas/engines/software_x11/evas_engine.c
index 81631c96b9..3bbf716646 100644
--- a/src/modules/evas/engines/software_x11/evas_engine.c
+++ b/src/modules/evas/engines/software_x11/evas_engine.c
@@ -232,7 +232,7 @@ _symbols(void)
232 232
233/* engine api this module provides */ 233/* engine api this module provides */
234static void * 234static void *
235eng_info(Evas *eo_e EINA_UNUSED) 235eng_info(void)
236{ 236{
237 Evas_Engine_Info_Software_X11 *info; 237 Evas_Engine_Info_Software_X11 *info;
238 238
@@ -251,7 +251,7 @@ eng_info(Evas *eo_e EINA_UNUSED)
251} 251}
252 252
253static void 253static void
254eng_info_free(Evas *eo_e EINA_UNUSED, void *info) 254eng_info_free(void *info)
255{ 255{
256 Evas_Engine_Info_Software_X11 *in; 256 Evas_Engine_Info_Software_X11 *in;
257 257
diff --git a/src/modules/evas/engines/wayland_egl/evas_engine.c b/src/modules/evas/engines/wayland_egl/evas_engine.c
index 1e329836d4..6b849b3c18 100644
--- a/src/modules/evas/engines/wayland_egl/evas_engine.c
+++ b/src/modules/evas/engines/wayland_egl/evas_engine.c
@@ -503,7 +503,7 @@ static const EVGL_Interface evgl_funcs =
503 503
504/* engine functions */ 504/* engine functions */
505static void * 505static void *
506eng_info(Evas *evas EINA_UNUSED) 506eng_info(void)
507{ 507{
508 Evas_Engine_Info_Wayland *info; 508 Evas_Engine_Info_Wayland *info;
509 509
diff --git a/src/modules/evas/engines/wayland_shm/evas_engine.c b/src/modules/evas/engines/wayland_shm/evas_engine.c
index fbcab307ec..61044c13c2 100644
--- a/src/modules/evas/engines/wayland_shm/evas_engine.c
+++ b/src/modules/evas/engines/wayland_shm/evas_engine.c
@@ -103,7 +103,7 @@ _symbols(void)
103 103
104/* ENGINE API FUNCTIONS WE PROVIDE */ 104/* ENGINE API FUNCTIONS WE PROVIDE */
105static void * 105static void *
106eng_info(Evas *eo_evas EINA_UNUSED) 106eng_info(void)
107{ 107{
108 Evas_Engine_Info_Wayland *einfo; 108 Evas_Engine_Info_Wayland *einfo;
109 109
@@ -121,8 +121,8 @@ eng_info(Evas *eo_evas EINA_UNUSED)
121 return einfo; 121 return einfo;
122} 122}
123 123
124static void 124static void
125eng_info_free(Evas *eo_evas EINA_UNUSED, void *info) 125eng_info_free(void *info)
126{ 126{
127 Evas_Engine_Info_Wayland *einfo; 127 Evas_Engine_Info_Wayland *einfo;
128 128