jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=b56a788e96fc26c72b38b3137d586bdd78521740
commit b56a788e96fc26c72b38b3137d586bdd78521740
Author: Jean-Philippe Andre <jp.an...@samsung.com>
Date: Tue Jan 17 20:56:33 2017 +0900
evas filters: Move displace to software generic (5/8)
---
src/Makefile_Evas.am | 2 +-
src/lib/evas/filters/evas_filter.c | 3 ---
src/lib/evas/filters/evas_filter_private.h | 1 -
src/modules/evas/engines/software_generic/evas_engine.c | 1 +
.../evas/engines/software_generic/filters/evas_engine_filter.h | 1 +
.../engines/software_generic}/filters/evas_filter_displace.c | 9 ++++-----
6 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/src/Makefile_Evas.am b/src/Makefile_Evas.am
index d9cbaef..c1bb961 100644
--- a/src/Makefile_Evas.am
+++ b/src/Makefile_Evas.am
@@ -594,7 +594,6 @@ 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_displace.c \
lib/evas/filters/evas_filter_parser.c \
lib/evas/filters/evas_filter_transform.c \
lib/evas/filters/evas_filter_utils.c \
@@ -616,6 +615,7 @@ 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_curve.c \
+modules/evas/engines/software_generic/filters/evas_filter_displace.c \
modules/evas/engines/software_generic/filters/evas_filter_fill.c \
modules/evas/engines/software_generic/filters/evas_filter_mask.c \
$(NULL)
diff --git a/src/lib/evas/filters/evas_filter.c
b/src/lib/evas/filters/evas_filter.c
index a5ffa59..97e06d1 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_DISPLACE:
- func = evas_filter_displace_cpu_func_get(cmd);
- break;
case EVAS_FILTER_MODE_BUMP:
func = evas_filter_bump_map_cpu_func_get(cmd);
break;
diff --git a/src/lib/evas/filters/evas_filter_private.h
b/src/lib/evas/filters/evas_filter_private.h
index c4f3d4b..3be64de 100644
--- a/src/lib/evas/filters/evas_filter_private.h
+++ b/src/lib/evas/filters/evas_filter_private.h
@@ -263,7 +263,6 @@ void
evas_filter_context_source_set(Evas_Filter_Context *ctx
/* FIXME: CPU filters entry points. Move these to the Evas Engine itself. */
Evas_Filter_Apply_Func evas_filter_blur_cpu_func_get(Evas_Filter_Command
*cmd);
Evas_Filter_Apply_Func evas_filter_bump_map_cpu_func_get(Evas_Filter_Command
*cmd);
-Evas_Filter_Apply_Func evas_filter_displace_cpu_func_get(Evas_Filter_Command
*cmd);
Evas_Filter_Apply_Func
evas_filter_transform_cpu_func_get(Evas_Filter_Command *cmd);
/* Utility functions */
diff --git a/src/modules/evas/engines/software_generic/evas_engine.c
b/src/modules/evas/engines/software_generic/evas_engine.c
index d71d7e7..f7fddb8 100644
--- a/src/modules/evas/engines/software_generic/evas_engine.c
+++ b/src/modules/evas/engines/software_generic/evas_engine.c
@@ -4629,6 +4629,7 @@ _gfx_filter_func_get(Evas_Filter_Command *cmd)
{
case EVAS_FILTER_MODE_BLEND: func = eng_filter_blend_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;
case EVAS_FILTER_MODE_MASK: func = eng_filter_mask_func_get(cmd); break;
default: return NULL;
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 fd282bd..ee26a0f 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
@@ -6,6 +6,7 @@
Evas_Filter_Apply_Func eng_filter_blend_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);
diff --git a/src/lib/evas/filters/evas_filter_displace.c
b/src/modules/evas/engines/software_generic/filters/evas_filter_displace.c
similarity index 97%
rename from src/lib/evas/filters/evas_filter_displace.c
rename to
src/modules/evas/engines/software_generic/filters/evas_filter_displace.c
index 01df460..b1624e5 100644
--- a/src/lib/evas/filters/evas_filter_displace.c
+++ b/src/modules/evas/engines/software_generic/filters/evas_filter_displace.c
@@ -1,5 +1,4 @@
-#include "evas_filter.h"
-#include "evas_filter_private.h"
+#include "evas_engine_filter.h"
static void
_filter_displace_cpu_alpha_do(int w, int h, int map_w, int map_h, int
intensity,
@@ -226,7 +225,7 @@ _filter_displace_cpu_alpha(Evas_Filter_Command *cmd)
map_h = h;
BUFFERS_LOCK();
- map_fb = evas_filter_buffer_scaled_get(cmd->ctx, cmd->mask, map_w,
map_h);
+ map_fb = cmd->ctx->buffer_scaled_get(cmd->ctx, cmd->mask, map_w,
map_h);
BUFFERS_UNLOCK();
EINA_SAFETY_ON_NULL_RETURN_VAL(map_fb, EINA_FALSE);
@@ -287,7 +286,7 @@ _filter_displace_cpu_rgba(Evas_Filter_Command *cmd)
map_h = h;
BUFFERS_LOCK();
- map_fb = evas_filter_buffer_scaled_get(cmd->ctx, cmd->mask, map_w,
map_h);
+ map_fb = cmd->ctx->buffer_scaled_get(cmd->ctx, cmd->mask, map_w,
map_h);
BUFFERS_UNLOCK();
EINA_SAFETY_ON_NULL_RETURN_VAL(map_fb, EINA_FALSE);
@@ -310,7 +309,7 @@ end:
}
Evas_Filter_Apply_Func
-evas_filter_displace_cpu_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->input, NULL);
--
