dimmus
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

evas: Render_Engine_Merge_Mode is actually about output.

This commit is contained in:
Cedric BAIL 2017-08-25 10:49:11 -07:00
parent f4afd5f1bd
commit e31707743a
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/modules/evas/engines/software_generic/Evas_Engine_Software_Generic.h
View File

@ -30,7 +30,7 @@ typedef enum
MERGE_BOUNDING = 1,
MERGE_FULL = 2,
MERGE_SMART = 4
} Render_Engine_Merge_Mode;
} Render_Output_Merge_Mode;
typedef struct _Render_Output_Software_Generic Render_Output_Software_Generic;
typedef struct _Outbuf Outbuf;
@ -72,7 +72,7 @@ struct _Render_Output_Software_Generic
unsigned int w, h;
Render_Engine_Swap_Mode swap_mode;
Render_Engine_Merge_Mode merge_mode;
Render_Output_Merge_Mode merge_mode;
unsigned char end : 1;
unsigned char lost_back : 1;
@ -152,7 +152,7 @@ evas_render_engine_software_generic_clean(Render_Output_Software_Generic *re)
static inline void
evas_render_engine_software_generic_merge_mode_set(Render_Output_Software_Generic *re)
{
Render_Engine_Merge_Mode merge_mode = MERGE_SMART;
Render_Output_Merge_Mode merge_mode = MERGE_SMART;
const char *s;
s = getenv("EVAS_GL_PARTIAL_MERGE");

2
src/modules/evas/engines/software_generic/evas_engine.c
View File

@ -4057,7 +4057,7 @@ _smart_merge(Tilebuf *tb, Tilebuf_Rect *rects)
}
static Tilebuf_Rect *
_merge_rects(Render_Engine_Merge_Mode merge_mode,
_merge_rects(Render_Output_Merge_Mode merge_mode,
Tilebuf *tb,
Tilebuf_Rect *r1,
Tilebuf_Rect *r2,