forked from enlightenment/efl
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.
This commit is contained in:
parent
a8d283567a
commit
190d84e84b
|
@ -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/include \
|
||||||
-I$(top_srcdir)/src/lib/evas/cserve2 \
|
-I$(top_srcdir)/src/lib/evas/cserve2 \
|
||||||
-I$(top_srcdir)/src/lib/evas/filters \
|
-I$(top_srcdir)/src/lib/evas/filters \
|
||||||
|
-I$(top_builddir)/src/lib/evas/canvas \
|
||||||
-I$(top_builddir)/src/modules/evas/engines/software_generic \
|
-I$(top_builddir)/src/modules/evas/engines/software_generic \
|
||||||
@EVAS_CFLAGS@
|
@EVAS_CFLAGS@
|
||||||
modules_evas_engines_software_generic_module_la_LIBADD = @USE_EVAS_LIBS@
|
modules_evas_engines_software_generic_module_la_LIBADD = @USE_EVAS_LIBS@
|
||||||
|
|
|
@ -1495,7 +1495,6 @@ static Eina_Bool
|
||||||
_filter_command_run(Evas_Filter_Command *cmd)
|
_filter_command_run(Evas_Filter_Command *cmd)
|
||||||
{
|
{
|
||||||
Evas_Filter_Support support = EVAS_FILTER_SUPPORT_NONE;
|
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->output, EINA_FALSE);
|
||||||
EINA_SAFETY_ON_NULL_RETURN_VAL(cmd->input, EINA_FALSE);
|
EINA_SAFETY_ON_NULL_RETURN_VAL(cmd->input, EINA_FALSE);
|
||||||
|
|
|
@ -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_Fill_Mode Evas_Filter_Fill_Mode;
|
||||||
typedef enum _Evas_Filter_Transform_Flags Evas_Filter_Transform_Flags;
|
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);
|
typedef void (* Evas_Filter_Cb) (Evas_Filter_Context *ctx, void *data, Eina_Bool success);
|
||||||
|
|
||||||
#define EVAS_FILTER_BUFFER_RGBA EINA_FALSE
|
#define EVAS_FILTER_BUFFER_RGBA EINA_FALSE
|
||||||
|
|
|
@ -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)
|
_gfx_filter_func_get(Evas_Filter_Command *cmd)
|
||||||
{
|
{
|
||||||
Evas_Filter_Apply_Func func = NULL;
|
Software_Filter_Func func = NULL;
|
||||||
|
|
||||||
switch (cmd->mode)
|
switch (cmd->mode)
|
||||||
{
|
{
|
||||||
|
@ -4653,7 +4653,7 @@ eng_gfx_filter_supports(void *data EINA_UNUSED, Evas_Filter_Command *cmd)
|
||||||
static Eina_Bool
|
static Eina_Bool
|
||||||
eng_gfx_filter_process(void *data EINA_UNUSED, Evas_Filter_Command *cmd)
|
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);
|
func = _gfx_filter_func_get(cmd);
|
||||||
EINA_SAFETY_ON_NULL_RETURN_VAL(func, EINA_FALSE);
|
EINA_SAFETY_ON_NULL_RETURN_VAL(func, EINA_FALSE);
|
||||||
|
|
|
@ -4,13 +4,14 @@
|
||||||
#include "evas_filter_private.h"
|
#include "evas_filter_private.h"
|
||||||
#include "draw.h"
|
#include "draw.h"
|
||||||
|
|
||||||
Evas_Filter_Apply_Func eng_filter_blend_func_get(Evas_Filter_Command *cmd);
|
typedef Eina_Bool (* Software_Filter_Func) (Evas_Filter_Command *cmd);
|
||||||
Evas_Filter_Apply_Func eng_filter_blur_func_get(Evas_Filter_Command *cmd);
|
Software_Filter_Func eng_filter_blend_func_get(Evas_Filter_Command *cmd);
|
||||||
Evas_Filter_Apply_Func eng_filter_bump_func_get(Evas_Filter_Command *cmd);
|
Software_Filter_Func eng_filter_blur_func_get(Evas_Filter_Command *cmd);
|
||||||
Evas_Filter_Apply_Func eng_filter_curve_func_get(Evas_Filter_Command *cmd);
|
Software_Filter_Func eng_filter_bump_func_get(Evas_Filter_Command *cmd);
|
||||||
Evas_Filter_Apply_Func eng_filter_displace_func_get(Evas_Filter_Command *cmd);
|
Software_Filter_Func eng_filter_curve_func_get(Evas_Filter_Command *cmd);
|
||||||
Evas_Filter_Apply_Func eng_filter_fill_func_get(Evas_Filter_Command *cmd);
|
Software_Filter_Func eng_filter_displace_func_get(Evas_Filter_Command *cmd);
|
||||||
Evas_Filter_Apply_Func eng_filter_mask_func_get(Evas_Filter_Command *cmd);
|
Software_Filter_Func eng_filter_fill_func_get(Evas_Filter_Command *cmd);
|
||||||
Evas_Filter_Apply_Func eng_filter_transform_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
|
#endif // EVAS_ENGINE_FILTER_H
|
||||||
|
|
|
@ -426,7 +426,7 @@ _mapped_blend(void *data, void *drawctx,
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
Evas_Filter_Apply_Func
|
Software_Filter_Func
|
||||||
eng_filter_blend_func_get(Evas_Filter_Command *cmd)
|
eng_filter_blend_func_get(Evas_Filter_Command *cmd)
|
||||||
{
|
{
|
||||||
EINA_SAFETY_ON_NULL_RETURN_VAL(cmd, NULL);
|
EINA_SAFETY_ON_NULL_RETURN_VAL(cmd, NULL);
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
#include "evas_filter_private.h"
|
#include "evas_engine_filter.h"
|
||||||
|
|
||||||
#include <math.h>
|
#include <math.h>
|
||||||
#include <time.h>
|
#include <time.h>
|
||||||
|
@ -378,7 +378,7 @@ _gaussian_blur_vert_apply_rgba(Evas_Filter_Command *cmd)
|
||||||
|
|
||||||
/* Main entry point */
|
/* Main entry point */
|
||||||
|
|
||||||
Evas_Filter_Apply_Func
|
Software_Filter_Func
|
||||||
eng_filter_blur_func_get(Evas_Filter_Command *cmd)
|
eng_filter_blur_func_get(Evas_Filter_Command *cmd)
|
||||||
{
|
{
|
||||||
EINA_SAFETY_ON_NULL_RETURN_VAL(cmd, NULL);
|
EINA_SAFETY_ON_NULL_RETURN_VAL(cmd, NULL);
|
||||||
|
|
|
@ -13,7 +13,7 @@
|
||||||
static Eina_Bool _bump_map_cpu_alpha_alpha(Evas_Filter_Command *cmd);
|
static Eina_Bool _bump_map_cpu_alpha_alpha(Evas_Filter_Command *cmd);
|
||||||
static Eina_Bool _bump_map_cpu_alpha_rgba(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)
|
eng_filter_bump_func_get(Evas_Filter_Command *cmd)
|
||||||
{
|
{
|
||||||
int w, h;
|
int w, h;
|
||||||
|
|
|
@ -115,7 +115,7 @@ end:
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
Evas_Filter_Apply_Func
|
Software_Filter_Func
|
||||||
eng_filter_curve_func_get(Evas_Filter_Command *cmd)
|
eng_filter_curve_func_get(Evas_Filter_Command *cmd)
|
||||||
{
|
{
|
||||||
EINA_SAFETY_ON_NULL_RETURN_VAL(cmd, NULL);
|
EINA_SAFETY_ON_NULL_RETURN_VAL(cmd, NULL);
|
||||||
|
|
|
@ -308,7 +308,7 @@ end:
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
Evas_Filter_Apply_Func
|
Software_Filter_Func
|
||||||
eng_filter_displace_func_get(Evas_Filter_Command *cmd)
|
eng_filter_displace_func_get(Evas_Filter_Command *cmd)
|
||||||
{
|
{
|
||||||
EINA_SAFETY_ON_NULL_RETURN_VAL(cmd, NULL);
|
EINA_SAFETY_ON_NULL_RETURN_VAL(cmd, NULL);
|
||||||
|
|
|
@ -56,7 +56,7 @@ _fill_cpu(Evas_Filter_Command *cmd)
|
||||||
return EINA_TRUE;
|
return EINA_TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
Evas_Filter_Apply_Func
|
Software_Filter_Func
|
||||||
eng_filter_fill_func_get(Evas_Filter_Command *cmd)
|
eng_filter_fill_func_get(Evas_Filter_Command *cmd)
|
||||||
{
|
{
|
||||||
EINA_SAFETY_ON_NULL_RETURN_VAL(cmd, NULL);
|
EINA_SAFETY_ON_NULL_RETURN_VAL(cmd, NULL);
|
||||||
|
|
|
@ -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_alpha_rgba(Evas_Filter_Command *cmd);
|
||||||
static Eina_Bool _mask_cpu_rgba_rgba_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)
|
eng_filter_mask_func_get(Evas_Filter_Command *cmd)
|
||||||
{
|
{
|
||||||
EINA_SAFETY_ON_NULL_RETURN_VAL(cmd, NULL);
|
EINA_SAFETY_ON_NULL_RETURN_VAL(cmd, NULL);
|
||||||
|
|
|
@ -116,7 +116,7 @@ end:
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
Evas_Filter_Apply_Func
|
Software_Filter_Func
|
||||||
eng_filter_transform_func_get(Evas_Filter_Command *cmd)
|
eng_filter_transform_func_get(Evas_Filter_Command *cmd)
|
||||||
{
|
{
|
||||||
EINA_SAFETY_ON_NULL_RETURN_VAL(cmd, NULL);
|
EINA_SAFETY_ON_NULL_RETURN_VAL(cmd, NULL);
|
||||||
|
|
Loading…
Reference in New Issue