summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCedric BAIL <cedric@osg.samsung.com>2017-08-25 10:47:11 -0700
committerCedric BAIL <cedric@osg.samsung.com>2017-08-25 10:47:11 -0700
commitbf2439b50112ac4d605b1f4073a358c18676c025 (patch)
tree107df1930fa8cd996516bbac6e1920e653120645
parent268d9984b4708bb18f9d84bd221a674f09d16048 (diff)
evas: Render_Engine_Software_Generic is actually Render_Output_Software_Generic.
-rw-r--r--src/modules/evas/engines/buffer/evas_engine.c2
-rw-r--r--src/modules/evas/engines/drm/evas_engine.c2
-rw-r--r--src/modules/evas/engines/fb/evas_engine.c2
-rw-r--r--src/modules/evas/engines/gl_generic/Evas_Engine_GL_Generic.h2
-rw-r--r--src/modules/evas/engines/software_ddraw/evas_engine.c2
-rw-r--r--src/modules/evas/engines/software_gdi/evas_engine.c2
-rw-r--r--src/modules/evas/engines/software_generic/Evas_Engine_Software_Generic.h18
-rw-r--r--src/modules/evas/engines/software_generic/evas_engine.c40
-rw-r--r--src/modules/evas/engines/software_x11/evas_engine.c2
-rw-r--r--src/modules/evas/engines/wayland_shm/evas_engine.c2
10 files changed, 37 insertions, 37 deletions
diff --git a/src/modules/evas/engines/buffer/evas_engine.c b/src/modules/evas/engines/buffer/evas_engine.c
index cb5867e85f..8ea1de643d 100644
--- a/src/modules/evas/engines/buffer/evas_engine.c
+++ b/src/modules/evas/engines/buffer/evas_engine.c
@@ -17,7 +17,7 @@ static Evas_Func func, pfunc;
17 17
18 18
19/* engine struct data */ 19/* engine struct data */
20typedef Render_Engine_Software_Generic Render_Engine; 20typedef Render_Output_Software_Generic Render_Engine;
21 21
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);
diff --git a/src/modules/evas/engines/drm/evas_engine.c b/src/modules/evas/engines/drm/evas_engine.c
index 77c183bdba..a00d670ff4 100644
--- a/src/modules/evas/engines/drm/evas_engine.c
+++ b/src/modules/evas/engines/drm/evas_engine.c
@@ -3,7 +3,7 @@
3 3
4typedef struct _Render_Engine 4typedef struct _Render_Engine
5{ 5{
6 Render_Engine_Software_Generic generic; 6 Render_Output_Software_Generic generic;
7 7
8 Ecore_Drm2_Device *dev; 8 Ecore_Drm2_Device *dev;
9} Render_Engine; 9} Render_Engine;
diff --git a/src/modules/evas/engines/fb/evas_engine.c b/src/modules/evas/engines/fb/evas_engine.c
index fa1125a235..65367f2068 100644
--- a/src/modules/evas/engines/fb/evas_engine.c
+++ b/src/modules/evas/engines/fb/evas_engine.c
@@ -14,7 +14,7 @@ static Eina_List *_outbufs = NULL;
14static Evas_Func func, pfunc; 14static Evas_Func func, pfunc;
15 15
16/* engine struct data */ 16/* engine struct data */
17typedef Render_Engine_Software_Generic Render_Engine; 17typedef Render_Output_Software_Generic Render_Engine;
18 18
19/* internal engine routines */ 19/* internal engine routines */
20static void * 20static void *
diff --git a/src/modules/evas/engines/gl_generic/Evas_Engine_GL_Generic.h b/src/modules/evas/engines/gl_generic/Evas_Engine_GL_Generic.h
index 6ee302d400..8a443a6e73 100644
--- a/src/modules/evas/engines/gl_generic/Evas_Engine_GL_Generic.h
+++ b/src/modules/evas/engines/gl_generic/Evas_Engine_GL_Generic.h
@@ -19,7 +19,7 @@ typedef void (*Window_GL_Context_Use)(Context_3D *ctx);
19 19
20struct _Render_Engine_GL_Generic 20struct _Render_Engine_GL_Generic
21{ 21{
22 Render_Engine_Software_Generic software; 22 Render_Output_Software_Generic software;
23 23
24 Window_Use window_use; 24 Window_Use window_use;
25 Window_GL_Context_Get window_gl_context_get; 25 Window_GL_Context_Get window_gl_context_get;
diff --git a/src/modules/evas/engines/software_ddraw/evas_engine.c b/src/modules/evas/engines/software_ddraw/evas_engine.c
index cdb0aa6dc9..9f004b9cd1 100644
--- a/src/modules/evas/engines/software_ddraw/evas_engine.c
+++ b/src/modules/evas/engines/software_ddraw/evas_engine.c
@@ -12,7 +12,7 @@ typedef struct _Render_Engine Render_Engine;
12 12
13struct _Render_Engine 13struct _Render_Engine
14{ 14{
15 Render_Engine_Software_Generic generic; 15 Render_Output_Software_Generic generic;
16}; 16};
17 17
18/* log domain variable */ 18/* log domain variable */
diff --git a/src/modules/evas/engines/software_gdi/evas_engine.c b/src/modules/evas/engines/software_gdi/evas_engine.c
index 34d9a23fb9..87f581eb26 100644
--- a/src/modules/evas/engines/software_gdi/evas_engine.c
+++ b/src/modules/evas/engines/software_gdi/evas_engine.c
@@ -12,7 +12,7 @@ typedef struct _Render_Engine Render_Engine;
12 12
13struct _Render_Engine 13struct _Render_Engine
14{ 14{
15 Render_Engine_Software_Generic generic; 15 Render_Output_Software_Generic generic;
16}; 16};
17 17
18 18
diff --git a/src/modules/evas/engines/software_generic/Evas_Engine_Software_Generic.h b/src/modules/evas/engines/software_generic/Evas_Engine_Software_Generic.h
index ee85165856..5db2a94017 100644
--- a/src/modules/evas/engines/software_generic/Evas_Engine_Software_Generic.h
+++ b/src/modules/evas/engines/software_generic/Evas_Engine_Software_Generic.h
@@ -25,14 +25,14 @@ typedef enum _Outbuf_Depth
25 OUTBUF_DEPTH_LAST 25 OUTBUF_DEPTH_LAST
26} Outbuf_Depth; 26} Outbuf_Depth;
27 27
28typedef enum 28typedef enum
29{ 29{
30 MERGE_BOUNDING, 30 MERGE_BOUNDING,
31 MERGE_FULL, 31 MERGE_FULL,
32 MERGE_SMART 32 MERGE_SMART
33} Render_Engine_Merge_Mode; 33} Render_Engine_Merge_Mode;
34 34
35typedef struct _Render_Engine_Software_Generic Render_Engine_Software_Generic; 35typedef struct _Render_Output_Software_Generic Render_Output_Software_Generic;
36typedef struct _Outbuf Outbuf; 36typedef struct _Outbuf Outbuf;
37 37
38typedef Render_Engine_Swap_Mode (*Outbuf_Swap_Mode_Get)(Outbuf *ob); 38typedef Render_Engine_Swap_Mode (*Outbuf_Swap_Mode_Get)(Outbuf *ob);
@@ -48,7 +48,7 @@ typedef int (*Outbuf_Get_Rot)(Outbuf *ob);
48typedef void (*Outbuf_Flush)(Outbuf *ob, Tilebuf_Rect *surface_damage, Tilebuf_Rect *buffer_damage, Evas_Render_Mode render_mode); 48typedef void (*Outbuf_Flush)(Outbuf *ob, Tilebuf_Rect *surface_damage, Tilebuf_Rect *buffer_damage, Evas_Render_Mode render_mode);
49typedef void (*Outbuf_Redraws_Clear)(Outbuf *ob); 49typedef void (*Outbuf_Redraws_Clear)(Outbuf *ob);
50 50
51struct _Render_Engine_Software_Generic 51struct _Render_Output_Software_Generic
52{ 52{
53 Outbuf *ob; 53 Outbuf *ob;
54 Tilebuf *tb; 54 Tilebuf *tb;
@@ -80,7 +80,7 @@ struct _Render_Engine_Software_Generic
80}; 80};
81 81
82static inline Eina_Bool 82static inline Eina_Bool
83evas_render_engine_software_generic_init(Render_Engine_Software_Generic *re, 83evas_render_engine_software_generic_init(Render_Output_Software_Generic *re,
84 Outbuf *ob, 84 Outbuf *ob,
85 Outbuf_Swap_Mode_Get outbuf_swap_mode_get, 85 Outbuf_Swap_Mode_Get outbuf_swap_mode_get,
86 Outbuf_Get_Rot outbuf_get_rot, 86 Outbuf_Get_Rot outbuf_get_rot,
@@ -135,7 +135,7 @@ evas_render_engine_software_generic_init(Render_Engine_Software_Generic *re,
135} 135}
136 136
137static inline void 137static inline void
138evas_render_engine_software_generic_clean(Render_Engine_Software_Generic *re) 138evas_render_engine_software_generic_clean(Render_Output_Software_Generic *re)
139{ 139{
140 if (re->tb) evas_common_tilebuf_free(re->tb); 140 if (re->tb) evas_common_tilebuf_free(re->tb);
141 if (re->ob) re->outbuf_free(re->ob); 141 if (re->ob) re->outbuf_free(re->ob);
@@ -146,18 +146,18 @@ evas_render_engine_software_generic_clean(Render_Engine_Software_Generic *re)
146 if (re->rects_prev[2]) evas_common_tilebuf_free_render_rects(re->rects_prev[2]); 146 if (re->rects_prev[2]) evas_common_tilebuf_free_render_rects(re->rects_prev[2]);
147 if (re->rects_prev[3]) evas_common_tilebuf_free_render_rects(re->rects_prev[3]); 147 if (re->rects_prev[3]) evas_common_tilebuf_free_render_rects(re->rects_prev[3]);
148 148
149 memset(re, 0, sizeof (Render_Engine_Software_Generic)); 149 memset(re, 0, sizeof (Render_Output_Software_Generic));
150} 150}
151 151
152static inline void 152static inline void
153evas_render_engine_software_generic_merge_mode_set(Render_Engine_Software_Generic *re, 153evas_render_engine_software_generic_merge_mode_set(Render_Output_Software_Generic *re,
154 Render_Engine_Merge_Mode merge_mode) 154 Render_Engine_Merge_Mode merge_mode)
155{ 155{
156 re->merge_mode = merge_mode; 156 re->merge_mode = merge_mode;
157} 157}
158 158
159static inline void 159static inline void
160evas_render_engine_software_generic_tile_strict_set(Render_Engine_Software_Generic *re, 160evas_render_engine_software_generic_tile_strict_set(Render_Output_Software_Generic *re,
161 Eina_Bool tile_strict) 161 Eina_Bool tile_strict)
162{ 162{
163 re->tile_strict = !!tile_strict; 163 re->tile_strict = !!tile_strict;
@@ -165,7 +165,7 @@ evas_render_engine_software_generic_tile_strict_set(Render_Engine_Software_Gener
165} 165}
166 166
167static inline Eina_Bool 167static inline Eina_Bool
168evas_render_engine_software_generic_update(Render_Engine_Software_Generic *re, 168evas_render_engine_software_generic_update(Render_Output_Software_Generic *re,
169 Outbuf *ob, 169 Outbuf *ob,
170 int w, int h) 170 int w, int h)
171{ 171{
diff --git a/src/modules/evas/engines/software_generic/evas_engine.c b/src/modules/evas/engines/software_generic/evas_engine.c
index f5caa73526..4362d2d2af 100644
--- a/src/modules/evas/engines/software_generic/evas_engine.c
+++ b/src/modules/evas/engines/software_generic/evas_engine.c
@@ -3858,7 +3858,7 @@ eng_gl_api_get(void *data EINA_UNUSED, int version)
3858static int 3858static int
3859eng_gl_error_get(void *data) 3859eng_gl_error_get(void *data)
3860{ 3860{
3861 Render_Engine_Software_Generic *re = data; 3861 Render_Output_Software_Generic *re = data;
3862 3862
3863 // TODO: Track EGL-like errors in the software engines 3863 // TODO: Track EGL-like errors in the software engines
3864 3864
@@ -3893,16 +3893,16 @@ eng_gl_rotation_angle_get(void *data EINA_UNUSED)
3893/* The following function require that any engine 3893/* The following function require that any engine
3894 inheriting from software generic to have at the 3894 inheriting from software generic to have at the
3895 top of their render engine structure a 3895 top of their render engine structure a
3896 Render_Engine_Software_Generic structure that is 3896 Render_Output_Software_Generic structure that is
3897 initialized by evas_render_engine_software_generic_init(). 3897 initialized by evas_render_engine_software_generic_init().
3898 */ 3898 */
3899 3899
3900static void 3900static void
3901eng_output_resize(void *engine EINA_UNUSED, void *data, int w, int h) 3901eng_output_resize(void *engine EINA_UNUSED, void *data, int w, int h)
3902{ 3902{
3903 Render_Engine_Software_Generic *re; 3903 Render_Output_Software_Generic *re;
3904 3904
3905 re = (Render_Engine_Software_Generic *)data; 3905 re = (Render_Output_Software_Generic *)data;
3906 re->outbuf_reconfigure(re->ob, w, h, re->outbuf_get_rot(re->ob), 3906 re->outbuf_reconfigure(re->ob, w, h, re->outbuf_get_rot(re->ob),
3907 OUTBUF_DEPTH_INHERIT); 3907 OUTBUF_DEPTH_INHERIT);
3908 evas_common_tilebuf_free(re->tb); 3908 evas_common_tilebuf_free(re->tb);
@@ -3919,36 +3919,36 @@ eng_output_resize(void *engine EINA_UNUSED, void *data, int w, int h)
3919static void 3919static void
3920eng_output_tile_size_set(void *engine EINA_UNUSED, void *data, int w, int h) 3920eng_output_tile_size_set(void *engine EINA_UNUSED, void *data, int w, int h)
3921{ 3921{
3922 Render_Engine_Software_Generic *re; 3922 Render_Output_Software_Generic *re;
3923 3923
3924 re = (Render_Engine_Software_Generic *)data; 3924 re = (Render_Output_Software_Generic *)data;
3925 evas_common_tilebuf_set_tile_size(re->tb, w, h); 3925 evas_common_tilebuf_set_tile_size(re->tb, w, h);
3926} 3926}
3927 3927
3928static void 3928static void
3929eng_output_redraws_rect_add(void *engine EINA_UNUSED, void *data, int x, int y, int w, int h) 3929eng_output_redraws_rect_add(void *engine EINA_UNUSED, void *data, int x, int y, int w, int h)
3930{ 3930{
3931 Render_Engine_Software_Generic *re; 3931 Render_Output_Software_Generic *re;
3932 3932
3933 re = (Render_Engine_Software_Generic *)data; 3933 re = (Render_Output_Software_Generic *)data;
3934 evas_common_tilebuf_add_redraw(re->tb, x, y, w, h); 3934 evas_common_tilebuf_add_redraw(re->tb, x, y, w, h);
3935} 3935}
3936 3936
3937static void 3937static void
3938eng_output_redraws_rect_del(void *engine EINA_UNUSED, void *data, int x, int y, int w, int h) 3938eng_output_redraws_rect_del(void *engine EINA_UNUSED, void *data, int x, int y, int w, int h)
3939{ 3939{
3940 Render_Engine_Software_Generic *re; 3940 Render_Output_Software_Generic *re;
3941 3941
3942 re = (Render_Engine_Software_Generic *)data; 3942 re = (Render_Output_Software_Generic *)data;
3943 evas_common_tilebuf_del_redraw(re->tb, x, y, w, h); 3943 evas_common_tilebuf_del_redraw(re->tb, x, y, w, h);
3944} 3944}
3945 3945
3946static void 3946static void
3947eng_output_redraws_clear(void *engine EINA_UNUSED, void *data) 3947eng_output_redraws_clear(void *engine EINA_UNUSED, void *data)
3948{ 3948{
3949 Render_Engine_Software_Generic *re; 3949 Render_Output_Software_Generic *re;
3950 3950
3951 re = (Render_Engine_Software_Generic *)data; 3951 re = (Render_Output_Software_Generic *)data;
3952 evas_common_tilebuf_clear(re->tb); 3952 evas_common_tilebuf_clear(re->tb);
3953 if (re->outbuf_redraws_clear) re->outbuf_redraws_clear(re->ob); 3953 if (re->outbuf_redraws_clear) re->outbuf_redraws_clear(re->ob);
3954} 3954}
@@ -4151,7 +4151,7 @@ _merge_rects(Render_Engine_Merge_Mode merge_mode,
4151static void * 4151static void *
4152eng_output_redraws_next_update_get(void *engine EINA_UNUSED, void *data, int *x, int *y, int *w, int *h, int *cx, int *cy, int *cw, int *ch) 4152eng_output_redraws_next_update_get(void *engine EINA_UNUSED, void *data, int *x, int *y, int *w, int *h, int *cx, int *cy, int *cw, int *ch)
4153{ 4153{
4154 Render_Engine_Software_Generic *re; 4154 Render_Output_Software_Generic *re;
4155 void *surface; 4155 void *surface;
4156 Tilebuf_Rect *rect; 4156 Tilebuf_Rect *rect;
4157 4157
@@ -4162,7 +4162,7 @@ eng_output_redraws_next_update_get(void *engine EINA_UNUSED, void *data, int *x,
4162 re->rects_prev[x] = NULL; \ 4162 re->rects_prev[x] = NULL; \
4163 } while (0) 4163 } while (0)
4164 4164
4165 re = (Render_Engine_Software_Generic *)data; 4165 re = (Render_Output_Software_Generic *)data;
4166 if (re->end) 4166 if (re->end)
4167 { 4167 {
4168 re->end = 0; 4168 re->end = 0;
@@ -4279,11 +4279,11 @@ eng_output_redraws_next_update_get(void *engine EINA_UNUSED, void *data, int *x,
4279static void 4279static void
4280eng_output_redraws_next_update_push(void *engine EINA_UNUSED, void *data, void *surface, int x, int y, int w, int h, Evas_Render_Mode render_mode) 4280eng_output_redraws_next_update_push(void *engine EINA_UNUSED, void *data, void *surface, int x, int y, int w, int h, Evas_Render_Mode render_mode)
4281{ 4281{
4282 Render_Engine_Software_Generic *re; 4282 Render_Output_Software_Generic *re;
4283 4283
4284 if (render_mode == EVAS_RENDER_MODE_ASYNC_INIT) return; 4284 if (render_mode == EVAS_RENDER_MODE_ASYNC_INIT) return;
4285 4285
4286 re = (Render_Engine_Software_Generic *)data; 4286 re = (Render_Output_Software_Generic *)data;
4287#if defined(BUILD_PIPE_RENDER) 4287#if defined(BUILD_PIPE_RENDER)
4288 evas_common_pipe_map_begin(surface); 4288 evas_common_pipe_map_begin(surface);
4289#endif /* BUILD_PIPE_RENDER */ 4289#endif /* BUILD_PIPE_RENDER */
@@ -4295,11 +4295,11 @@ eng_output_redraws_next_update_push(void *engine EINA_UNUSED, void *data, void *
4295static void 4295static void
4296eng_output_flush(void *engine EINA_UNUSED, void *data, Evas_Render_Mode render_mode) 4296eng_output_flush(void *engine EINA_UNUSED, void *data, Evas_Render_Mode render_mode)
4297{ 4297{
4298 Render_Engine_Software_Generic *re; 4298 Render_Output_Software_Generic *re;
4299 4299
4300 if (render_mode == EVAS_RENDER_MODE_ASYNC_INIT) return; 4300 if (render_mode == EVAS_RENDER_MODE_ASYNC_INIT) return;
4301 4301
4302 re = (Render_Engine_Software_Generic *)data; 4302 re = (Render_Output_Software_Generic *)data;
4303 if (re->outbuf_flush) re->outbuf_flush(re->ob, re->rects_prev[0], re->rects, render_mode); 4303 if (re->outbuf_flush) re->outbuf_flush(re->ob, re->rects_prev[0], re->rects, render_mode);
4304 if (re->rects && render_mode != EVAS_RENDER_MODE_ASYNC_INIT) 4304 if (re->rects && render_mode != EVAS_RENDER_MODE_ASYNC_INIT)
4305 { 4305 {
@@ -4311,9 +4311,9 @@ eng_output_flush(void *engine EINA_UNUSED, void *data, Evas_Render_Mode render_m
4311static void 4311static void
4312eng_output_idle_flush(void *engine EINA_UNUSED, void *data) 4312eng_output_idle_flush(void *engine EINA_UNUSED, void *data)
4313{ 4313{
4314 Render_Engine_Software_Generic *re; 4314 Render_Output_Software_Generic *re;
4315 4315
4316 re = (Render_Engine_Software_Generic *)data; 4316 re = (Render_Output_Software_Generic *)data;
4317 if (re->outbuf_idle_flush) re->outbuf_idle_flush(re->ob); 4317 if (re->outbuf_idle_flush) re->outbuf_idle_flush(re->ob);
4318} 4318}
4319 4319
diff --git a/src/modules/evas/engines/software_x11/evas_engine.c b/src/modules/evas/engines/software_x11/evas_engine.c
index 3bbf716646..488c161dbf 100644
--- a/src/modules/evas/engines/software_x11/evas_engine.c
+++ b/src/modules/evas/engines/software_x11/evas_engine.c
@@ -36,7 +36,7 @@ typedef struct _Render_Engine Render_Engine;
36 36
37struct _Render_Engine 37struct _Render_Engine
38{ 38{
39 Render_Engine_Software_Generic generic; 39 Render_Output_Software_Generic generic;
40 Eina_Bool (*outbuf_alpha_get)(Outbuf *ob); 40 Eina_Bool (*outbuf_alpha_get)(Outbuf *ob);
41 41
42 struct 42 struct
diff --git a/src/modules/evas/engines/wayland_shm/evas_engine.c b/src/modules/evas/engines/wayland_shm/evas_engine.c
index 61044c13c2..d2283806c2 100644
--- a/src/modules/evas/engines/wayland_shm/evas_engine.c
+++ b/src/modules/evas/engines/wayland_shm/evas_engine.c
@@ -24,7 +24,7 @@ Evas_Native_Tbm_Surface_Stride_Get_Call glsym__evas_native_tbm_surface_stride_g
24typedef struct _Render_Engine Render_Engine; 24typedef struct _Render_Engine Render_Engine;
25struct _Render_Engine 25struct _Render_Engine
26{ 26{
27 Render_Engine_Software_Generic generic; 27 Render_Output_Software_Generic generic;
28}; 28};
29 29
30/* LOCAL FUNCTIONS */ 30/* LOCAL FUNCTIONS */