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

evas filters: Move bump to software generic (6/8)

This commit is contained in:
Jean-Philippe Andre 2017-01-17 21:00:36 +09:00
parent b56a788e96
commit 1b95d22c2c
5 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Makefile_Evas.am
View File

@ -593,7 +593,6 @@ lib_evas_libevas_la_SOURCES += \
lib/evas/canvas/evas_filter_mixin.c \
lib/evas/filters/evas_filter.c \
lib/evas/filters/evas_filter_blur.c \
lib/evas/filters/evas_filter_bump.c \
lib/evas/filters/evas_filter_parser.c \
lib/evas/filters/evas_filter_transform.c \
lib/evas/filters/evas_filter_utils.c \
@ -614,6 +613,7 @@ lib/evas/filters/blur/blur_box_rgba_neon.c
GFX_FILTER_SW_FILES = \
modules/evas/engines/software_generic/filters/evas_engine_filter.h \
modules/evas/engines/software_generic/filters/evas_filter_blend.c \
modules/evas/engines/software_generic/filters/evas_filter_bump.c \
modules/evas/engines/software_generic/filters/evas_filter_curve.c \
modules/evas/engines/software_generic/filters/evas_filter_displace.c \
modules/evas/engines/software_generic/filters/evas_filter_fill.c \

3
src/lib/evas/filters/evas_filter.c
View File

@ -1541,9 +1541,6 @@ _filter_command_run(Evas_Filter_Command *cmd)
case EVAS_FILTER_MODE_BLUR:
func = evas_filter_blur_cpu_func_get(cmd);
break;
case EVAS_FILTER_MODE_BUMP:
func = evas_filter_bump_map_cpu_func_get(cmd);
break;
case EVAS_FILTER_MODE_TRANSFORM:
func = evas_filter_transform_cpu_func_get(cmd);
break;

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

@ -4628,6 +4628,7 @@ _gfx_filter_func_get(Evas_Filter_Command *cmd)
switch (cmd->mode)
{
case EVAS_FILTER_MODE_BLEND: func = eng_filter_blend_func_get(cmd); break;
case EVAS_FILTER_MODE_BUMP: func = eng_filter_bump_func_get(cmd); break;
case EVAS_FILTER_MODE_CURVE: func = eng_filter_curve_func_get(cmd); break;
case EVAS_FILTER_MODE_DISPLACE: func = eng_filter_displace_func_get(cmd); break;
case EVAS_FILTER_MODE_FILL: func = eng_filter_fill_func_get(cmd); break;

1
src/modules/evas/engines/software_generic/filters/evas_engine_filter.h
View File

@ -5,6 +5,7 @@
#include "draw.h"
Evas_Filter_Apply_Func eng_filter_blend_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);

6
src/lib/evas/filters/evas_filter_bump.c → src/modules/evas/engines/software_generic/filters/evas_filter_bump.c
View File

@ -1,8 +1,6 @@
/* Simple bump map algorithms for the software engine */
#include "evas_filter_private.h"
#include "evas_blend_private.h"
#include "evas_engine_filter.h"
#include <math.h>
#ifdef CLAMP
@ -16,7 +14,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
evas_filter_bump_map_cpu_func_get(Evas_Filter_Command *cmd)
eng_filter_bump_func_get(Evas_Filter_Command *cmd)
{
int w, h;