jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=190d84e84ba571d964ee826032c3ef93c42bef0d
commit 190d84e84ba571d964ee826032c3ef93c42bef0d
Author: Jean-Philippe Andre <jp.an...@samsung.com>
Date: Tue Jan 17 22:15:09 2017 +0900
evas: Rename software filter function type
From Evas_Filter_Apply_Func to Software_Filter_Func.
Also fix include dir for out-of-tree builds of non-static sw generic.
---
src/Makefile_Evas.am | 1 +
src/lib/evas/filters/evas_filter.c | 1 -
src/lib/evas/include/evas_filter.h | 1 -
src/modules/evas/engines/software_generic/evas_engine.c | 6 +++---
.../software_generic/filters/evas_engine_filter.h | 17 +++++++++--------
.../software_generic/filters/evas_filter_blend.c | 2 +-
.../engines/software_generic/filters/evas_filter_blur.c | 4 ++--
.../engines/software_generic/filters/evas_filter_bump.c | 2 +-
.../software_generic/filters/evas_filter_curve.c | 2 +-
.../software_generic/filters/evas_filter_displace.c | 2 +-
.../engines/software_generic/filters/evas_filter_fill.c | 2 +-
.../engines/software_generic/filters/evas_filter_mask.c | 2 +-
.../software_generic/filters/evas_filter_transform.c | 2 +-
13 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/src/Makefile_Evas.am b/src/Makefile_Evas.am
index d6dcd9c..7bea8c3 100644
--- a/src/Makefile_Evas.am
+++ b/src/Makefile_Evas.am
@@ -672,6 +672,7 @@ modules_evas_engines_software_generic_module_la_CPPFLAGS =
-I$(top_builddir)/src
-I$(top_srcdir)/src/lib/evas/include \
-I$(top_srcdir)/src/lib/evas/cserve2 \
-I$(top_srcdir)/src/lib/evas/filters \
+-I$(top_builddir)/src/lib/evas/canvas \
-I$(top_builddir)/src/modules/evas/engines/software_generic \
@EVAS_CFLAGS@
modules_evas_engines_software_generic_module_la_LIBADD = @USE_EVAS_LIBS@
diff --git a/src/lib/evas/filters/evas_filter.c
b/src/lib/evas/filters/evas_filter.c
index b8b993e..d00aa44 100644
--- a/src/lib/evas/filters/evas_filter.c
+++ b/src/lib/evas/filters/evas_filter.c
@@ -1495,7 +1495,6 @@ static Eina_Bool
_filter_command_run(Evas_Filter_Command *cmd)
{
Evas_Filter_Support support = EVAS_FILTER_SUPPORT_NONE;
- Evas_Filter_Apply_Func func = NULL;
EINA_SAFETY_ON_NULL_RETURN_VAL(cmd->output, EINA_FALSE);
EINA_SAFETY_ON_NULL_RETURN_VAL(cmd->input, EINA_FALSE);
diff --git a/src/lib/evas/include/evas_filter.h
b/src/lib/evas/include/evas_filter.h
index 0c87af2..cfea9bd 100644
--- a/src/lib/evas/include/evas_filter.h
+++ b/src/lib/evas/include/evas_filter.h
@@ -44,7 +44,6 @@ typedef enum _Evas_Filter_Bump_Flags Evas_Filter_Bump_Flags;
typedef enum _Evas_Filter_Fill_Mode Evas_Filter_Fill_Mode;
typedef enum _Evas_Filter_Transform_Flags Evas_Filter_Transform_Flags;
-typedef Eina_Bool (* Evas_Filter_Apply_Func) (Evas_Filter_Command *cmd);
typedef void (* Evas_Filter_Cb) (Evas_Filter_Context *ctx, void *data,
Eina_Bool success);
#define EVAS_FILTER_BUFFER_RGBA 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 84c8937..4ccec9b 100644
--- a/src/modules/evas/engines/software_generic/evas_engine.c
+++ b/src/modules/evas/engines/software_generic/evas_engine.c
@@ -4620,10 +4620,10 @@ eng_ector_end(void *data EINA_UNUSED, void *context
EINA_UNUSED, Ector_Surface *
//------------------------------------------------//
-static Evas_Filter_Apply_Func
+static Software_Filter_Func
_gfx_filter_func_get(Evas_Filter_Command *cmd)
{
- Evas_Filter_Apply_Func func = NULL;
+ Software_Filter_Func func = NULL;
switch (cmd->mode)
{
@@ -4653,7 +4653,7 @@ eng_gfx_filter_supports(void *data EINA_UNUSED,
Evas_Filter_Command *cmd)
static Eina_Bool
eng_gfx_filter_process(void *data EINA_UNUSED, Evas_Filter_Command *cmd)
{
- Evas_Filter_Apply_Func func;
+ Software_Filter_Func func;
func = _gfx_filter_func_get(cmd);
EINA_SAFETY_ON_NULL_RETURN_VAL(func, EINA_FALSE);
diff --git
a/src/modules/evas/engines/software_generic/filters/evas_engine_filter.h
b/src/modules/evas/engines/software_generic/filters/evas_engine_filter.h
index 9d67574..f8bfebd 100644
--- a/src/modules/evas/engines/software_generic/filters/evas_engine_filter.h
+++ b/src/modules/evas/engines/software_generic/filters/evas_engine_filter.h
@@ -4,13 +4,14 @@
#include "evas_filter_private.h"
#include "draw.h"
-Evas_Filter_Apply_Func eng_filter_blend_func_get(Evas_Filter_Command *cmd);
-Evas_Filter_Apply_Func eng_filter_blur_func_get(Evas_Filter_Command *cmd);
-Evas_Filter_Apply_Func eng_filter_bump_func_get(Evas_Filter_Command *cmd);
-Evas_Filter_Apply_Func eng_filter_curve_func_get(Evas_Filter_Command *cmd);
-Evas_Filter_Apply_Func eng_filter_displace_func_get(Evas_Filter_Command *cmd);
-Evas_Filter_Apply_Func eng_filter_fill_func_get(Evas_Filter_Command *cmd);
-Evas_Filter_Apply_Func eng_filter_mask_func_get(Evas_Filter_Command *cmd);
-Evas_Filter_Apply_Func eng_filter_transform_func_get(Evas_Filter_Command *cmd);
+typedef Eina_Bool (* Software_Filter_Func) (Evas_Filter_Command *cmd);
+Software_Filter_Func eng_filter_blend_func_get(Evas_Filter_Command *cmd);
+Software_Filter_Func eng_filter_blur_func_get(Evas_Filter_Command *cmd);
+Software_Filter_Func eng_filter_bump_func_get(Evas_Filter_Command *cmd);
+Software_Filter_Func eng_filter_curve_func_get(Evas_Filter_Command *cmd);
+Software_Filter_Func eng_filter_displace_func_get(Evas_Filter_Command *cmd);
+Software_Filter_Func eng_filter_fill_func_get(Evas_Filter_Command *cmd);
+Software_Filter_Func eng_filter_mask_func_get(Evas_Filter_Command *cmd);
+Software_Filter_Func eng_filter_transform_func_get(Evas_Filter_Command *cmd);
#endif // EVAS_ENGINE_FILTER_H
diff --git
a/src/modules/evas/engines/software_generic/filters/evas_filter_blend.c
b/src/modules/evas/engines/software_generic/filters/evas_filter_blend.c
index 947723e..4f3615d 100644
--- a/src/modules/evas/engines/software_generic/filters/evas_filter_blend.c
+++ b/src/modules/evas/engines/software_generic/filters/evas_filter_blend.c
@@ -426,7 +426,7 @@ _mapped_blend(void *data, void *drawctx,
return ret;
}
-Evas_Filter_Apply_Func
+Software_Filter_Func
eng_filter_blend_func_get(Evas_Filter_Command *cmd)
{
EINA_SAFETY_ON_NULL_RETURN_VAL(cmd, NULL);
diff --git
a/src/modules/evas/engines/software_generic/filters/evas_filter_blur.c
b/src/modules/evas/engines/software_generic/filters/evas_filter_blur.c
index 1dd59fd..9ba324a 100644
--- a/src/modules/evas/engines/software_generic/filters/evas_filter_blur.c
+++ b/src/modules/evas/engines/software_generic/filters/evas_filter_blur.c
@@ -1,4 +1,4 @@
-#include "evas_filter_private.h"
+#include "evas_engine_filter.h"
#include <math.h>
#include <time.h>
@@ -378,7 +378,7 @@ _gaussian_blur_vert_apply_rgba(Evas_Filter_Command *cmd)
/* Main entry point */
-Evas_Filter_Apply_Func
+Software_Filter_Func
eng_filter_blur_func_get(Evas_Filter_Command *cmd)
{
EINA_SAFETY_ON_NULL_RETURN_VAL(cmd, NULL);
diff --git
a/src/modules/evas/engines/software_generic/filters/evas_filter_bump.c
b/src/modules/evas/engines/software_generic/filters/evas_filter_bump.c
index 3b33c20..0e4a800 100644
--- a/src/modules/evas/engines/software_generic/filters/evas_filter_bump.c
+++ b/src/modules/evas/engines/software_generic/filters/evas_filter_bump.c
@@ -13,7 +13,7 @@
static Eina_Bool _bump_map_cpu_alpha_alpha(Evas_Filter_Command *cmd);
static Eina_Bool _bump_map_cpu_alpha_rgba(Evas_Filter_Command *cmd);
-Evas_Filter_Apply_Func
+Software_Filter_Func
eng_filter_bump_func_get(Evas_Filter_Command *cmd)
{
int w, h;
diff --git
a/src/modules/evas/engines/software_generic/filters/evas_filter_curve.c
b/src/modules/evas/engines/software_generic/filters/evas_filter_curve.c
index c19d1d6..51fefa7 100644
--- a/src/modules/evas/engines/software_generic/filters/evas_filter_curve.c
+++ b/src/modules/evas/engines/software_generic/filters/evas_filter_curve.c
@@ -115,7 +115,7 @@ end:
return ret;
}
-Evas_Filter_Apply_Func
+Software_Filter_Func
eng_filter_curve_func_get(Evas_Filter_Command *cmd)
{
EINA_SAFETY_ON_NULL_RETURN_VAL(cmd, NULL);
diff --git
a/src/modules/evas/engines/software_generic/filters/evas_filter_displace.c
b/src/modules/evas/engines/software_generic/filters/evas_filter_displace.c
index b1624e5..aeea412 100644
--- a/src/modules/evas/engines/software_generic/filters/evas_filter_displace.c
+++ b/src/modules/evas/engines/software_generic/filters/evas_filter_displace.c
@@ -308,7 +308,7 @@ end:
return ret;
}
-Evas_Filter_Apply_Func
+Software_Filter_Func
eng_filter_displace_func_get(Evas_Filter_Command *cmd)
{
EINA_SAFETY_ON_NULL_RETURN_VAL(cmd, NULL);
diff --git
a/src/modules/evas/engines/software_generic/filters/evas_filter_fill.c
b/src/modules/evas/engines/software_generic/filters/evas_filter_fill.c
index dcd1f64..87a0075 100644
--- a/src/modules/evas/engines/software_generic/filters/evas_filter_fill.c
+++ b/src/modules/evas/engines/software_generic/filters/evas_filter_fill.c
@@ -56,7 +56,7 @@ _fill_cpu(Evas_Filter_Command *cmd)
return EINA_TRUE;
}
-Evas_Filter_Apply_Func
+Software_Filter_Func
eng_filter_fill_func_get(Evas_Filter_Command *cmd)
{
EINA_SAFETY_ON_NULL_RETURN_VAL(cmd, NULL);
diff --git
a/src/modules/evas/engines/software_generic/filters/evas_filter_mask.c
b/src/modules/evas/engines/software_generic/filters/evas_filter_mask.c
index 6b1d0be..9243811 100644
--- a/src/modules/evas/engines/software_generic/filters/evas_filter_mask.c
+++ b/src/modules/evas/engines/software_generic/filters/evas_filter_mask.c
@@ -9,7 +9,7 @@ static Eina_Bool _mask_cpu_alpha_alpha_rgba(Evas_Filter_Command
*cmd);
static Eina_Bool _mask_cpu_rgba_alpha_rgba(Evas_Filter_Command *cmd);
static Eina_Bool _mask_cpu_rgba_rgba_rgba(Evas_Filter_Command *cmd);
-Evas_Filter_Apply_Func
+Software_Filter_Func
eng_filter_mask_func_get(Evas_Filter_Command *cmd)
{
EINA_SAFETY_ON_NULL_RETURN_VAL(cmd, NULL);
diff --git
a/src/modules/evas/engines/software_generic/filters/evas_filter_transform.c
b/src/modules/evas/engines/software_generic/filters/evas_filter_transform.c
index 31354e8..2ff9db6 100644
--- a/src/modules/evas/engines/software_generic/filters/evas_filter_transform.c
+++ b/src/modules/evas/engines/software_generic/filters/evas_filter_transform.c
@@ -116,7 +116,7 @@ end:
return ret;
}
-Evas_Filter_Apply_Func
+Software_Filter_Func
eng_filter_transform_func_get(Evas_Filter_Command *cmd)
{
EINA_SAFETY_ON_NULL_RETURN_VAL(cmd, NULL);
--
