From ae2d399dd6467beecc0e16d9f851008be99cd998 Mon Sep 17 00:00:00 2001 From: "Carsten Haitzler (Rasterman)" Date: Mon, 12 Nov 2018 16:10:08 +0000 Subject: [PATCH] build - evas - sse3 optimized code - decouple from eo --- .../evas/common/evas_op_blend/op_blend_master_sse3.c | 9 ++++++++- src/lib/evas/include/evas_common_private.h | 7 +------ src/lib/evas/include/evas_common_types.h | 10 ++++++++++ 3 files changed, 19 insertions(+), 7 deletions(-) create mode 100644 src/lib/evas/include/evas_common_types.h diff --git a/src/lib/evas/common/evas_op_blend/op_blend_master_sse3.c b/src/lib/evas/common/evas_op_blend/op_blend_master_sse3.c index 2947b8b6b2..6065054c15 100644 --- a/src/lib/evas/common/evas_op_blend/op_blend_master_sse3.c +++ b/src/lib/evas/common/evas_op_blend/op_blend_master_sse3.c @@ -1,6 +1,13 @@ #define NEED_SSE3 1 -#include "evas_common_private.h" +#include "Eina.h" + +#include "evas_common_types.h" + +EAPI void evas_common_cpu_end_opt(void); + +#include "config.h" +#include "evas_blend_ops.h" #ifdef BUILD_SSE3 static __m128i A_MASK_SSE3; diff --git a/src/lib/evas/include/evas_common_private.h b/src/lib/evas/include/evas_common_private.h index 6399ced6d0..d0354347fc 100644 --- a/src/lib/evas/include/evas_common_private.h +++ b/src/lib/evas/include/evas_common_private.h @@ -391,10 +391,7 @@ extern EAPI int _evas_log_dom_global; #include "../file/evas_module.h" -typedef unsigned long long DATA64; -typedef unsigned int DATA32; -typedef unsigned short DATA16; -typedef unsigned char DATA8; +#include "evas_common_types.h" typedef struct _Image_Entry Image_Entry; typedef struct _Image_Entry_Flags Image_Entry_Flags; @@ -442,8 +439,6 @@ typedef int FPc; // one fp unit #define FP1 (1 << (FP)) -typedef void (*RGBA_Gfx_Func) (DATA32 *src, DATA8 *mask, DATA32 col, DATA32 *dst, int len); -typedef void (*RGBA_Gfx_Pt_Func) (DATA32 src, DATA8 mask, DATA32 col, DATA32 *dst); typedef void (*Gfx_Func_Copy) (DATA32 *src, DATA32 *dst, int len); typedef void (*Gfx_Func_Convert) (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal); diff --git a/src/lib/evas/include/evas_common_types.h b/src/lib/evas/include/evas_common_types.h new file mode 100644 index 0000000000..cb3ba3cec6 --- /dev/null +++ b/src/lib/evas/include/evas_common_types.h @@ -0,0 +1,10 @@ +#ifndef EVAS_COMMON_TYPES_H +# define EVAS_COMMON_TYPES_H 1 +typedef unsigned long long DATA64; +typedef unsigned int DATA32; +typedef unsigned short DATA16; +typedef unsigned char DATA8; + +typedef void (*RGBA_Gfx_Func) (DATA32 *src, DATA8 *mask, DATA32 col, DATA32 *dst, int len); +typedef void (*RGBA_Gfx_Pt_Func) (DATA32 src, DATA8 mask, DATA32 col, DATA32 *dst); +#endif