[EGIT] [core/efl] master 06/53: evas filters: Move bump to software generic (6/8)

[Jean-Philippe ANDRÉ]

jpeg pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=1b95d22c2c48f5ba23268dd917fa75524102ef7a

commit 1b95d22c2c48f5ba23268dd917fa75524102ef7a
Author: Jean-Philippe Andre <jp.an...@samsung.com>
Date:   Tue Jan 17 21:00:36 2017 +0900

    evas filters: Move bump to software generic (6/8)
---
 src/Makefile_Evas.am                                                | 2 +-
 src/lib/evas/filters/evas_filter.c                                  | 3 ---
 src/modules/evas/engines/software_generic/evas_engine.c             | 1 +
 .../evas/engines/software_generic/filters/evas_engine_filter.h      | 1 +
 .../evas/engines/software_generic}/filters/evas_filter_bump.c       | 6 ++----
 5 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/Makefile_Evas.am b/src/Makefile_Evas.am
index c1bb961..713a28e 100644
--- a/src/Makefile_Evas.am
+++ b/src/Makefile_Evas.am
@@ -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 \
diff --git a/src/lib/evas/filters/evas_filter.c 
b/src/lib/evas/filters/evas_filter.c
index 97e06d1..895ca4e 100644
--- a/src/lib/evas/filters/evas_filter.c
+++ b/src/lib/evas/filters/evas_filter.c
@@ -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;
diff --git a/src/modules/evas/engines/software_generic/evas_engine.c 
b/src/modules/evas/engines/software_generic/evas_engine.c
index f7fddb8..ff89abd 100644
--- a/src/modules/evas/engines/software_generic/evas_engine.c
+++ b/src/modules/evas/engines/software_generic/evas_engine.c
@@ -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;
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 ee26a0f..31a326c 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
@@ -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);
diff --git a/src/lib/evas/filters/evas_filter_bump.c 
b/src/modules/evas/engines/software_generic/filters/evas_filter_bump.c
similarity index 99%
rename from src/lib/evas/filters/evas_filter_bump.c
rename to src/modules/evas/engines/software_generic/filters/evas_filter_bump.c
index c7f12cb..3b33c20 100644
--- a/src/lib/evas/filters/evas_filter_bump.c
+++ b/src/modules/evas/engines/software_generic/filters/evas_filter_bump.c
@@ -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;
 

--