jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=581505791a2b87f8bfe5a7d6870f6becc409c04e
commit 581505791a2b87f8bfe5a7d6870f6becc409c04e
Author: Jean-Philippe Andre <jp.an...@samsung.com>
Date: Fri Dec 16 10:40:55 2016 +0900
evas: Remove context from some engine function
This is for canvas_alpha_get. context is never used.
---
src/lib/evas/canvas/evas_render.c | 2 +-
src/lib/evas/canvas/render2/evas_render2_old.c | 3 +--
src/lib/evas/include/evas_private.h | 2 +-
src/modules/evas/engines/buffer/evas_engine.c | 2 +-
src/modules/evas/engines/eglfs/evas_engine.c | 2 +-
src/modules/evas/engines/fb/evas_engine.c | 2 +-
src/modules/evas/engines/gl_cocoa/evas_engine.c | 2 +-
src/modules/evas/engines/gl_drm/evas_engine.c | 2 +-
src/modules/evas/engines/gl_sdl/evas_engine.c | 2 +-
src/modules/evas/engines/gl_x11/evas_engine.c | 2 +-
src/modules/evas/engines/psl1ght/evas_engine.c | 2 +-
src/modules/evas/engines/software_ddraw/evas_engine.c | 2 +-
src/modules/evas/engines/software_gdi/evas_engine.c | 2 +-
src/modules/evas/engines/software_generic/evas_engine.c | 2 +-
src/modules/evas/engines/software_x11/evas_engine.c | 2 +-
src/modules/evas/engines/wayland_egl/evas_engine.c | 2 +-
16 files changed, 16 insertions(+), 17 deletions(-)
diff --git a/src/lib/evas/canvas/evas_render.c
b/src/lib/evas/canvas/evas_render.c
index 42cb32f..73682f3 100644
--- a/src/lib/evas/canvas/evas_render.c
+++ b/src/lib/evas/canvas/evas_render.c
@@ -2959,7 +2959,7 @@ evas_render_updates_internal(Evas *eo_e,
}
/* phase 1.5. check if the video should be inlined or stay in their overlay
*/
- alpha = ENFN->canvas_alpha_get(ENDT, ENCTX);
+ alpha = ENFN->canvas_alpha_get(ENDT);
EINA_LIST_FOREACH(e->video_objects, ll, eo_obj)
{
diff --git a/src/lib/evas/canvas/render2/evas_render2_old.c
b/src/lib/evas/canvas/render2/evas_render2_old.c
index d57d31d..b486bae 100644
--- a/src/lib/evas/canvas/render2/evas_render2_old.c
+++ b/src/lib/evas/canvas/render2/evas_render2_old.c
@@ -274,8 +274,7 @@ _evas_render2_stage_render_do(Evas_Public_Data *e,
Eina_Bool do_async EINA_UNUSE
// XXX: actually render now (either in thread or in mainloop)
// XXX:
printf(" _evas_render2_stage_render_do %p\n", e);
- alpha = e->engine.func->canvas_alpha_get(e->engine.data.output,
- e->engine.data.context);
+ alpha = e->engine.func->canvas_alpha_get(e->engine.data.output);
while ((uinf.surface =
e->engine.func->output_redraws_next_update_get
(e->engine.data.output,
diff --git a/src/lib/evas/include/evas_private.h
b/src/lib/evas/include/evas_private.h
index 356c3c3..9fe56df 100644
--- a/src/lib/evas/include/evas_private.h
+++ b/src/lib/evas/include/evas_private.h
@@ -1363,7 +1363,7 @@ struct _Evas_Func
void *(*context_new) (void *data);
void *(*context_dup) (void *data, void *context);
- Eina_Bool (*canvas_alpha_get) (void *data, void *context);
+ Eina_Bool (*canvas_alpha_get) (void *data);
void (*context_free) (void *data, void *context);
void (*context_clip_set) (void *data, void *context, int x,
int y, int w, int h);
void (*context_clip_image_set) (void *data, void *context, void
*surface, int x, int y, Evas_Public_Data *evas, Eina_Bool do_async);
diff --git a/src/modules/evas/engines/buffer/evas_engine.c
b/src/modules/evas/engines/buffer/evas_engine.c
index b838d99..5d2efdf 100644
--- a/src/modules/evas/engines/buffer/evas_engine.c
+++ b/src/modules/evas/engines/buffer/evas_engine.c
@@ -165,7 +165,7 @@ eng_output_free(void *data)
}
static Eina_Bool
-eng_canvas_alpha_get(void *data, void *context EINA_UNUSED)
+eng_canvas_alpha_get(void *data)
{
Render_Engine *re;
diff --git a/src/modules/evas/engines/eglfs/evas_engine.c
b/src/modules/evas/engines/eglfs/evas_engine.c
index 3e5b7ee..b7fa945 100644
--- a/src/modules/evas/engines/eglfs/evas_engine.c
+++ b/src/modules/evas/engines/eglfs/evas_engine.c
@@ -864,7 +864,7 @@ eng_output_free(void *data)
}
static Eina_Bool
-eng_canvas_alpha_get(void *data, void *info EINA_UNUSED)
+eng_canvas_alpha_get(void *data)
{
Render_Engine *re;
diff --git a/src/modules/evas/engines/fb/evas_engine.c
b/src/modules/evas/engines/fb/evas_engine.c
index b144c8a..b87a7aa 100644
--- a/src/modules/evas/engines/fb/evas_engine.c
+++ b/src/modules/evas/engines/fb/evas_engine.c
@@ -185,7 +185,7 @@ eng_output_free(void *data)
}
static Eina_Bool
-eng_canvas_alpha_get(void *data, void *context EINA_UNUSED)
+eng_canvas_alpha_get(void *data)
{
Render_Engine *re;
diff --git a/src/modules/evas/engines/gl_cocoa/evas_engine.c
b/src/modules/evas/engines/gl_cocoa/evas_engine.c
index 6b480e6..3e9739b 100644
--- a/src/modules/evas/engines/gl_cocoa/evas_engine.c
+++ b/src/modules/evas/engines/gl_cocoa/evas_engine.c
@@ -246,7 +246,7 @@ eng_output_free(void *data)
}
static Eina_Bool
-eng_canvas_alpha_get(void *data EINA_UNUSED, void *info EINA_UNUSED)
+eng_canvas_alpha_get(void *data EINA_UNUSED)
{
return EINA_TRUE;
}
diff --git a/src/modules/evas/engines/gl_drm/evas_engine.c
b/src/modules/evas/engines/gl_drm/evas_engine.c
index 3ebe209..0482cbc 100644
--- a/src/modules/evas/engines/gl_drm/evas_engine.c
+++ b/src/modules/evas/engines/gl_drm/evas_engine.c
@@ -1029,7 +1029,7 @@ eng_output_free(void *data)
}
static Eina_Bool
-eng_canvas_alpha_get(void *data, void *info EINA_UNUSED)
+eng_canvas_alpha_get(void *data)
{
Render_Engine *re;
diff --git a/src/modules/evas/engines/gl_sdl/evas_engine.c
b/src/modules/evas/engines/gl_sdl/evas_engine.c
index 0bc8681..4dc112d 100644
--- a/src/modules/evas/engines/gl_sdl/evas_engine.c
+++ b/src/modules/evas/engines/gl_sdl/evas_engine.c
@@ -352,7 +352,7 @@ eng_output_dump(void *data)
}
static Eina_Bool
-eng_canvas_alpha_get(void *data EINA_UNUSED, void *info EINA_UNUSED)
+eng_canvas_alpha_get(void *data EINA_UNUSED)
{
return 0;
}
diff --git a/src/modules/evas/engines/gl_x11/evas_engine.c
b/src/modules/evas/engines/gl_x11/evas_engine.c
index 5303549..0f7279b 100644
--- a/src/modules/evas/engines/gl_x11/evas_engine.c
+++ b/src/modules/evas/engines/gl_x11/evas_engine.c
@@ -1907,7 +1907,7 @@ eng_preload_make_current(void *data, void *doit)
}
static Eina_Bool
-eng_canvas_alpha_get(void *data, void *info EINA_UNUSED)
+eng_canvas_alpha_get(void *data)
{
Render_Engine *re = (Render_Engine *)data;
return re->generic.software.ob->alpha;
diff --git a/src/modules/evas/engines/psl1ght/evas_engine.c
b/src/modules/evas/engines/psl1ght/evas_engine.c
index 31fd1de..a37849d 100644
--- a/src/modules/evas/engines/psl1ght/evas_engine.c
+++ b/src/modules/evas/engines/psl1ght/evas_engine.c
@@ -415,7 +415,7 @@ eng_output_idle_flush(void *data)
}
static Eina_Bool
-eng_canvas_alpha_get(void *data, void *context EINA_UNUSED)
+eng_canvas_alpha_get(void *data)
{
Render_Engine *re;
diff --git a/src/modules/evas/engines/software_ddraw/evas_engine.c
b/src/modules/evas/engines/software_ddraw/evas_engine.c
index 9c4314c..367d3f6 100644
--- a/src/modules/evas/engines/software_ddraw/evas_engine.c
+++ b/src/modules/evas/engines/software_ddraw/evas_engine.c
@@ -112,7 +112,7 @@ eng_output_free(void *data)
}
static Eina_Bool
-eng_canvas_alpha_get(void *data EINA_UNUSED, void *context EINA_UNUSED)
+eng_canvas_alpha_get(void *data EINA_UNUSED)
{
#warning "We need to handle window with alpha channel."
return EINA_FALSE;
diff --git a/src/modules/evas/engines/software_gdi/evas_engine.c
b/src/modules/evas/engines/software_gdi/evas_engine.c
index 413d20b..e4c76ac 100644
--- a/src/modules/evas/engines/software_gdi/evas_engine.c
+++ b/src/modules/evas/engines/software_gdi/evas_engine.c
@@ -148,7 +148,7 @@ eng_output_free(void *data)
}
static Eina_Bool
-eng_canvas_alpha_get(void *data EINA_UNUSED, void *context EINA_UNUSED)
+eng_canvas_alpha_get(void *data EINA_UNUSED)
{
#warning "We need to handle window with alpha channel."
return EINA_FALSE;
diff --git a/src/modules/evas/engines/software_generic/evas_engine.c
b/src/modules/evas/engines/software_generic/evas_engine.c
index 6ab60d2..fad9dec 100644
--- a/src/modules/evas/engines/software_generic/evas_engine.c
+++ b/src/modules/evas/engines/software_generic/evas_engine.c
@@ -3442,7 +3442,7 @@ eng_font_hinting_can_hint(void *data EINA_UNUSED, int
hinting)
}
static Eina_Bool
-eng_canvas_alpha_get(void *data EINA_UNUSED, void *info EINA_UNUSED)
+eng_canvas_alpha_get(void *data EINA_UNUSED)
{
return EINA_TRUE;
}
diff --git a/src/modules/evas/engines/software_x11/evas_engine.c
b/src/modules/evas/engines/software_x11/evas_engine.c
index 8c8f6f7..718afdb 100644
--- a/src/modules/evas/engines/software_x11/evas_engine.c
+++ b/src/modules/evas/engines/software_x11/evas_engine.c
@@ -445,7 +445,7 @@ eng_output_free(void *data)
}
static Eina_Bool
-eng_canvas_alpha_get(void *data, void *context EINA_UNUSED)
+eng_canvas_alpha_get(void *data)
{
Render_Engine *re;
diff --git a/src/modules/evas/engines/wayland_egl/evas_engine.c
b/src/modules/evas/engines/wayland_egl/evas_engine.c
index 761d3f9..4546dd7 100644
--- a/src/modules/evas/engines/wayland_egl/evas_engine.c
+++ b/src/modules/evas/engines/wayland_egl/evas_engine.c
@@ -749,7 +749,7 @@ ob_err:
}
static Eina_Bool
-eng_canvas_alpha_get(void *data, void *info EINA_UNUSED)
+eng_canvas_alpha_get(void *data)
{
Render_Engine *re;
--
