summaryrefslogtreecommitdiff
path: root/src/modules
diff options
context:
space:
mode:
authorCedric BAIL <cedric@osg.samsung.com>2017-08-25 10:49:11 -0700
committerCedric BAIL <cedric@osg.samsung.com>2017-08-25 10:49:11 -0700
commite31707743a58aa249214870e158ac051193b16e2 (patch)
tree8e9ad061b5171367ec08443c6a7f06d6470bcf5d /src/modules
parentf4afd5f1bd27323ac579dc41da8a12293f798a67 (diff)
evas: Render_Engine_Merge_Mode is actually about output.
Diffstat (limited to 'src/modules')
-rw-r--r--src/modules/evas/engines/software_generic/Evas_Engine_Software_Generic.h6
-rw-r--r--src/modules/evas/engines/software_generic/evas_engine.c2
2 files changed, 4 insertions, 4 deletions
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 bf859dc..833b31e 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
@@ -30,7 +30,7 @@ typedef enum
30 MERGE_BOUNDING = 1, 30 MERGE_BOUNDING = 1,
31 MERGE_FULL = 2, 31 MERGE_FULL = 2,
32 MERGE_SMART = 4 32 MERGE_SMART = 4
33} Render_Engine_Merge_Mode; 33} Render_Output_Merge_Mode;
34 34
35typedef struct _Render_Output_Software_Generic Render_Output_Software_Generic; 35typedef struct _Render_Output_Software_Generic Render_Output_Software_Generic;
36typedef struct _Outbuf Outbuf; 36typedef struct _Outbuf Outbuf;
@@ -72,7 +72,7 @@ struct _Render_Output_Software_Generic
72 unsigned int w, h; 72 unsigned int w, h;
73 73
74 Render_Engine_Swap_Mode swap_mode; 74 Render_Engine_Swap_Mode swap_mode;
75 Render_Engine_Merge_Mode merge_mode; 75 Render_Output_Merge_Mode merge_mode;
76 76
77 unsigned char end : 1; 77 unsigned char end : 1;
78 unsigned char lost_back : 1; 78 unsigned char lost_back : 1;
@@ -152,7 +152,7 @@ evas_render_engine_software_generic_clean(Render_Output_Software_Generic *re)
152static inline void 152static inline void
153evas_render_engine_software_generic_merge_mode_set(Render_Output_Software_Generic *re) 153evas_render_engine_software_generic_merge_mode_set(Render_Output_Software_Generic *re)
154{ 154{
155 Render_Engine_Merge_Mode merge_mode = MERGE_SMART; 155 Render_Output_Merge_Mode merge_mode = MERGE_SMART;
156 const char *s; 156 const char *s;
157 157
158 s = getenv("EVAS_GL_PARTIAL_MERGE"); 158 s = getenv("EVAS_GL_PARTIAL_MERGE");
diff --git a/src/modules/evas/engines/software_generic/evas_engine.c b/src/modules/evas/engines/software_generic/evas_engine.c
index 3245f9a..3ea6c71 100644
--- a/src/modules/evas/engines/software_generic/evas_engine.c
+++ b/src/modules/evas/engines/software_generic/evas_engine.c
@@ -4057,7 +4057,7 @@ _smart_merge(Tilebuf *tb, Tilebuf_Rect *rects)
4057} 4057}
4058 4058
4059static Tilebuf_Rect * 4059static Tilebuf_Rect *
4060_merge_rects(Render_Engine_Merge_Mode merge_mode, 4060_merge_rects(Render_Output_Merge_Mode merge_mode,
4061 Tilebuf *tb, 4061 Tilebuf *tb,
4062 Tilebuf_Rect *r1, 4062 Tilebuf_Rect *r1,
4063 Tilebuf_Rect *r2, 4063 Tilebuf_Rect *r2,