remove ifdefs for BUILD_C as we always have c fallbacks now - no

choice, and MMX and SSE are built together under BUILD_MMX - SSE3
still separate.



SVN revision: 78031
This commit is contained in:
Carsten Haitzler 2012-10-16 04:00:18 +00:00
parent 0e814d48e4
commit 8c088a95dd
42 changed files with 46 additions and 405 deletions

View File

@ -1027,8 +1027,6 @@ build_pipe_render="no"
#######################################
## CPU architecture specific assembly
AC_DEFINE(BUILD_C, 1, [Build plain C code])
build_cpu_mmx="no"
build_cpu_sse3="no"
build_cpu_altivec="no"
@ -1037,7 +1035,6 @@ build_cpu_neon="no"
case $host_cpu in
i*86|x86_64|amd64)
AC_DEFINE(BUILD_MMX, 1, [Build MMX Code])
AC_DEFINE(BUILD_SSE, 1, [Build SSE Code])
build_cpu_mmx="yes"
build_cpu_sse3="yes"
;;

View File

@ -1,7 +1,7 @@
#include "evas_common.h"
#include "evas_blend_private.h"
#if defined BUILD_MMX || defined BUILD_SSE
#ifdef BUILD_MMX
#include "evas_mmx.h"
#endif

View File

@ -1,6 +1,6 @@
#include "evas_common.h"
#if defined BUILD_MMX || defined BUILD_SSE
#ifdef BUILD_MMX
#include "evas_mmx.h"
#endif
@ -233,7 +233,6 @@ evas_common_copy_pixels_rev_neon(DATA32 *src, DATA32 *dst, int len)
#endif
#ifdef BUILD_C
static void
evas_common_copy_pixels_c(DATA32 *src, DATA32 *dst, int len)
{
@ -241,7 +240,6 @@ evas_common_copy_pixels_c(DATA32 *src, DATA32 *dst, int len)
while (dst < dst_end) *dst++ = *src++;
}
#endif
#ifdef BUILD_MMX
static void
@ -259,11 +257,9 @@ evas_common_copy_pixels_mmx(DATA32 *src, DATA32 *dst, int len)
if ((src_align != dst_align) ||
((src_align & 0x3) != 0))
{
#ifdef BUILD_C
evas_common_copy_pixels_c(src, dst, len);
return;
}
#endif
while ((src_align > 0) && (len > 0))
{
@ -301,9 +297,7 @@ evas_common_copy_pixels_mmx2(DATA32 *src, DATA32 *dst, int len)
if ((src_align != dst_align) ||
((src_align & 0x3) != 0))
{
#ifdef BUILD_C
evas_common_copy_pixels_c(src, dst, len);
#endif
return;
}
@ -420,7 +414,7 @@ evas_common_copy_pixels_neon(DATA32 *src, DATA32 *dst, int len){
}
#endif /* BUILD_NEON */
#ifdef BUILD_SSE
#ifdef BUILD_MMX
static void
evas_common_copy_pixels_sse(DATA32 *src, DATA32 *dst, int len)
{
@ -454,9 +448,7 @@ evas_common_copy_pixels_sse(DATA32 *src, DATA32 *dst, int len)
if ((src_align != dst_align) ||
((src_align & 0x3) != 0))
{
#ifdef BUILD_C
evas_common_copy_pixels_c(src, dst, len);
#endif
return;
}
@ -494,7 +486,6 @@ evas_common_copy_pixels_sse(DATA32 *src, DATA32 *dst, int len)
/****************************************************************************/
#ifdef BUILD_C
static void
evas_common_copy_pixels_rev_c(DATA32 *src, DATA32 *dst, int len)
{
@ -506,7 +497,6 @@ evas_common_copy_pixels_rev_c(DATA32 *src, DATA32 *dst, int len)
while (dst > dst_end) *dst-- = *src--;
}
#endif
#ifdef BUILD_MMX
static void
@ -543,7 +533,7 @@ evas_common_copy_pixels_rev_mmx(DATA32 *src, DATA32 *dst, int len)
}
#endif
#ifdef BUILD_SSE
#ifdef BUILD_MMX
static void
evas_common_copy_pixels_rev_sse(DATA32 *src, DATA32 *dst, int len)
{
@ -586,7 +576,6 @@ evas_common_copy_pixels_rev_sse(DATA32 *src, DATA32 *dst, int len)
}
#endif
Gfx_Func_Copy
evas_common_draw_func_copy_get(int pixels, int reverse)
{
@ -594,107 +583,32 @@ evas_common_draw_func_copy_get(int pixels, int reverse)
return evas_common_copy_rev_pixels_c;
if (reverse)
{
#ifdef BUILD_SSE
if (evas_common_cpu_has_feature(CPU_FEATURE_SSE) && (pixels > 256 * 256))
return evas_common_copy_pixels_rev_sse;
#endif
#ifdef BUILD_MMX
# ifdef BUILD_SSE
else
# endif
if (evas_common_cpu_has_feature(CPU_FEATURE_MMX))
return evas_common_copy_pixels_rev_mmx;
if (evas_common_cpu_has_feature(CPU_FEATURE_SSE) && (pixels > 64 * 64))
return evas_common_copy_pixels_rev_sse;
else if (evas_common_cpu_has_feature(CPU_FEATURE_MMX))
return evas_common_copy_pixels_rev_mmx;
#endif
#ifdef BUILD_NEON
# if defined(BUILD_SSE) || defined(BUILD_MMX)
else
# endif
if (evas_common_cpu_has_feature(CPU_FEATURE_NEON))
return evas_common_copy_pixels_rev_neon;
#endif
#ifdef BUILD_C
# if defined(BUILD_MMX) || defined(BUILD_NEON)
else
# endif
return evas_common_copy_pixels_rev_c;
if (evas_common_cpu_has_feature(CPU_FEATURE_NEON))
return evas_common_copy_pixels_rev_neon;
#endif
return evas_common_copy_pixels_rev_c;
}
else
{
#if 1
# ifdef BUILD_MMX
# ifdef BUILD_C
if (evas_common_cpu_has_feature(CPU_FEATURE_MMX2))
# endif
return evas_common_copy_pixels_mmx2;
# ifdef BUILD_SSE
else
# endif
#endif
#ifdef BUILD_SSE
# ifdef BUILD_C
if (evas_common_cpu_has_feature(CPU_FEATURE_SSE) && (pixels > 64 * 64))
# endif
return evas_common_copy_pixels_sse;
# ifdef BUILD_MMX
else
# endif
#endif
# ifdef BUILD_NEON
# ifdef BUILD_C
if (evas_common_cpu_has_feature(CPU_FEATURE_NEON))
# endif
return evas_common_copy_pixels_neon;
# ifdef BUILD_SSE
else
# endif
#endif
#ifdef BUILD_MMX
# ifdef BUILD_C
if (evas_common_cpu_has_feature(CPU_FEATURE_MMX))
# endif
return evas_common_copy_pixels_mmx;
# ifdef BUILD_C
else
# endif
if (evas_common_cpu_has_feature(CPU_FEATURE_SSE) && (pixels > 64 * 64))
return evas_common_copy_pixels_sse;
else if (evas_common_cpu_has_feature(CPU_FEATURE_MMX2))
return evas_common_copy_pixels_mmx2;
else if (evas_common_cpu_has_feature(CPU_FEATURE_MMX))
return evas_common_copy_pixels_mmx;
#endif
#ifdef BUILD_C
return evas_common_copy_pixels_c;
#endif
#else
# ifdef BUILD_SSE
if (evas_common_cpu_has_feature(CPU_FEATURE_SSE) && (pixels > 256 * 256))
return evas_common_copy_pixels_sse;
# ifdef BUILD_MMX
else
# endif
#endif
#ifdef BUILD_MMX
# ifdef BUILD_C
if (evas_common_cpu_has_feature(CPU_FEATURE_MMX2))
# endif
return evas_common_copy_pixels_mmx2;
# ifdef BUILD_C
else if (evas_common_cpu_has_feature(CPU_FEATURE_MMX))
# endif
return evas_common_copy_pixels_mmx;
# ifdef BUILD_C
else
# endif
#endif
#ifdef BUILD_C
return evas_common_copy_pixels_c;
#endif
#ifdef BUILD_NEON
if (evas_common_cpu_has_feature(CPU_FEATURE_NEON))
return evas_common_copy_pixels_neon;
#endif
}
#ifdef BUILD_C
return evas_common_copy_pixels_c;
#else
return NULL;
#endif
}

View File

@ -1,11 +1,11 @@
#include "evas_common.h"
#include "evas_convert_yuv.h"
#if defined BUILD_MMX
#ifdef BUILD_MMX
# include "evas_mmx.h"
#endif
#if defined HAVE_ALTIVEC_H
#ifdef HAVE_ALTIVEC_H
# include <altivec.h>
#ifdef CONFIG_DARWIN
#define AVV(x...) (x)
@ -45,7 +45,7 @@ static void _evas_nv12tiledtorgb_raster(unsigned char **yuv, unsigned char *rgb,
#define RZ(i) (i >> (BITRES - RES))
#define FOUR(i) {i, i, i, i}
#if defined BUILD_MMX || defined BUILD_SSE
#ifdef BUILD_MMX
__attribute__ ((aligned (8))) const volatile unsigned short _const_crvcrv[4] = FOUR(RZ(CRV));
__attribute__ ((aligned (8))) const volatile unsigned short _const_cbucbu[4] = FOUR(RZ(CBU));
__attribute__ ((aligned (8))) const volatile unsigned short _const_cgucgu[4] = FOUR(RZ(CGU));
@ -123,17 +123,10 @@ static int initted = 0;
void
evas_common_convert_yuv_420p_601_rgba(DATA8 **src, DATA8 *dst, int w, int h)
{
int mmx, sse, sse2;
int mmx = 0, sse = 0, sse2 = 0;
#if defined BUILD_MMX || defined BUILD_SSE
#ifdef BUILD_MMX
evas_common_cpu_can_do(&mmx, &sse, &sse2);
#endif
#ifndef BUILD_SSE
sse = 0;
sse2 = 0;
#endif
#ifndef BUILD_MMX
mmx = 0;
#endif
if (evas_common_cpu_has_feature(CPU_FEATURE_MMX2))
_evas_yv12torgb_sse(src, dst, w, h);
@ -172,7 +165,7 @@ evas_common_convert_yuv_420p_601_rgba(DATA8 **src, DATA8 *dst, int w, int h)
static void
_evas_yv12torgb_sse(unsigned char **yuv, unsigned char *rgb, int w, int h)
{
#ifdef BUILD_SSE
#ifdef BUILD_MMX
int xx, yy;
register unsigned char *yp1, *up, *vp;
unsigned char *dp1;

View File

@ -1,8 +1,7 @@
#include "evas_common.h"
#if defined BUILD_MMX || defined BUILD_SSE
#ifdef BUILD_MMX
#include "evas_mmx.h"
#endif
#if defined BUILD_SSE3
#include <immintrin.h>
#endif
@ -57,7 +56,7 @@ evas_common_cpu_mmx2_test(void)
void
evas_common_cpu_sse_test(void)
{
#ifdef BUILD_SSE
#ifdef BUILD_MMX
int blah[16];
movntq_r2m(mm0, blah);
@ -174,31 +173,29 @@ evas_common_cpu_init(void)
evas_common_cpu_end_opt();
if (getenv("EVAS_CPU_NO_MMX2"))
cpu_feature_mask &= ~CPU_FEATURE_MMX2;
#ifdef BUILD_SSE
cpu_feature_mask |= CPU_FEATURE_SSE *
evas_common_cpu_feature_test(evas_common_cpu_sse_test);
evas_common_cpu_end_opt();
if (getenv("EVAS_CPU_NO_SSE"))
cpu_feature_mask &= ~CPU_FEATURE_SSE;
#ifdef BUILD_SSE3
# ifdef BUILD_SSE3
cpu_feature_mask |= CPU_FEATURE_SSE3 *
evas_common_cpu_feature_test(evas_common_cpu_sse3_test);
evas_common_cpu_end_opt();
if (getenv("EVAS_CPU_NO_SSE3"))
cpu_feature_mask &= ~CPU_FEATURE_SSE3;
#endif /* BUILD_SSE3 */
#endif /* BUILD_SSE */
# endif /* BUILD_SSE3 */
#endif /* BUILD_MMX */
#ifdef BUILD_ALTIVEC
#ifdef __POWERPC__
#ifdef __VEC__
# ifdef __POWERPC__
# ifdef __VEC__
cpu_feature_mask |= CPU_FEATURE_ALTIVEC *
evas_common_cpu_feature_test(evas_common_cpu_altivec_test);
evas_common_cpu_end_opt();
if (getenv("EVAS_CPU_NO_ALTIVEC"))
cpu_feature_mask &= ~CPU_FEATURE_ALTIVEC;
#endif /* __VEC__ */
#endif /* __POWERPC__ */
# endif /* __VEC__ */
# endif /* __POWERPC__ */
#endif /* BUILD_ALTIVEC */
#ifdef __SPARC__
cpu_feature_mask |= CPU_FEATURE_VIS *
@ -208,13 +205,13 @@ evas_common_cpu_init(void)
cpu_feature_mask &= ~CPU_FEATURE_VIS;
#endif /* __SPARC__ */
#if defined(__ARM_ARCH__)
#ifdef BUILD_NEON
# ifdef BUILD_NEON
cpu_feature_mask |= CPU_FEATURE_NEON *
evas_common_cpu_feature_test(evas_common_cpu_neon_test);
evas_common_cpu_end_opt();
if (getenv("EVAS_CPU_NO_NEON"))
cpu_feature_mask &= ~CPU_FEATURE_NEON;
#endif
# endif
#endif
}
@ -270,8 +267,7 @@ evas_common_cpu_can_do(int *mmx, int *sse, int *sse2)
EAPI void
evas_common_cpu_end_opt(void)
{
if (cpu_feature_mask &
(CPU_FEATURE_MMX | CPU_FEATURE_MMX2))
if (cpu_feature_mask & (CPU_FEATURE_MMX | CPU_FEATURE_MMX2))
{
emms();
}

View File

@ -1,33 +1,25 @@
/* add color -> dst */
#ifdef BUILD_C
static void
init_add_color_span_funcs_c(void)
{
}
#endif
#ifdef BUILD_C
static void
init_add_color_pt_funcs_c(void)
{
}
#endif
/*-----*/
/* add_rel color -> dst */
#ifdef BUILD_C
static void
init_add_rel_color_span_funcs_c(void)
{
}
#endif
#ifdef BUILD_C
static void
init_add_rel_color_pt_funcs_c(void)
{
}
#endif

View File

@ -1,33 +1,26 @@
/* add mask x color -> dst */
#ifdef BUILD_C
static void
init_add_mask_color_span_funcs_c(void)
{
}
#endif
#ifdef BUILD_C
static void
init_add_mask_color_pt_funcs_c(void)
{
}
#endif
/*-----*/
/* add_rel mask x color -> dst */
#ifdef BUILD_C
static void
init_add_rel_mask_color_span_funcs_c(void)
{
}
#endif
#ifdef BUILD_C
static void
init_add_rel_mask_color_pt_funcs_c(void)
{
}
#endif

View File

@ -1,33 +1,25 @@
/* add pixel --> dst */
#ifdef BUILD_C
static void
init_add_pixel_span_funcs_c(void)
{
}
#endif
#ifdef BUILD_C
static void
init_add_pixel_pt_funcs_c(void)
{
}
#endif
/*-----*/
/* add_rel pixel --> dst */
#ifdef BUILD_C
static void
init_add_rel_pixel_span_funcs_c(void)
{
}
#endif
#ifdef BUILD_C
static void
init_add_rel_pixel_pt_funcs_c(void)
{
}
#endif

View File

@ -1,33 +1,25 @@
/* add pixel x color --> dst */
#ifdef BUILD_C
static void
init_add_pixel_color_span_funcs_c(void)
{
}
#endif
#ifdef BUILD_C
static void
init_add_pixel_color_pt_funcs_c(void)
{
}
#endif
/*-----*/
/* add_rel pixel x color --> dst */
#ifdef BUILD_C
static void
init_add_rel_pixel_color_span_funcs_c(void)
{
}
#endif
#ifdef BUILD_C
static void
init_add_rel_pixel_color_pt_funcs_c(void)
{
}
#endif

View File

@ -1,37 +1,29 @@
/* add pixel x mask --> dst */
#ifdef BUILD_C
/* XXX: not used
static void
init_add_pixel_mask_span_funcs_c(void)
{
}
*/
#endif
#ifdef BUILD_C
/* XXX: not used
static void
init_add_pixel_mask_pt_funcs_c(void)
{
}
*/
#endif
/*-----*/
/* add_rel pixel x mask --> dst */
#ifdef BUILD_C
static void
init_add_rel_pixel_mask_span_funcs_c(void)
{
}
#endif
#ifdef BUILD_C
static void
init_add_rel_pixel_mask_pt_funcs_c(void)
{
}
#endif

View File

@ -100,7 +100,6 @@ op_add_init(void)
init_add_color_pt_funcs_mmx();
init_add_mask_color_pt_funcs_mmx();
#endif
#ifdef BUILD_C
init_add_pixel_span_funcs_c();
init_add_pixel_color_span_funcs_c();
init_add_rel_pixel_mask_span_funcs_c();
@ -112,7 +111,6 @@ op_add_init(void)
init_add_rel_pixel_mask_pt_funcs_c();
init_add_color_pt_funcs_c();
init_add_mask_color_pt_funcs_c();
#endif
}
static void
@ -133,11 +131,9 @@ add_gfx_span_func_cpu(int s, int m, int c, int d)
if (func) return func;
}
#endif
#ifdef BUILD_C
cpu = CPU_C;
func = op_add_span_funcs[s][m][c][d][cpu];
if (func) return func;
#endif
return func;
}
@ -228,11 +224,9 @@ add_gfx_pt_func_cpu(int s, int m, int c, int d)
if (func) return func;
}
#endif
#ifdef BUILD_C
cpu = CPU_C;
func = op_add_pt_funcs[s][m][c][d][cpu];
if (func) return func;
#endif
return func;
}
@ -330,7 +324,6 @@ op_add_rel_init(void)
init_add_rel_color_pt_funcs_mmx();
init_add_rel_mask_color_pt_funcs_mmx();
#endif
#ifdef BUILD_C
init_add_rel_pixel_span_funcs_c();
init_add_rel_pixel_color_span_funcs_c();
init_add_rel_pixel_mask_span_funcs_c();
@ -342,7 +335,6 @@ op_add_rel_init(void)
init_add_rel_pixel_mask_pt_funcs_c();
init_add_rel_color_pt_funcs_c();
init_add_rel_mask_color_pt_funcs_c();
#endif
}
static void
@ -363,11 +355,9 @@ add_rel_gfx_span_func_cpu(int s, int m, int c, int d)
if (func) return func;
}
#endif
#ifdef BUILD_C
cpu = CPU_C;
func = op_add_rel_span_funcs[s][m][c][d][cpu];
if (func) return func;
#endif
return func;
}
@ -458,11 +448,9 @@ add_rel_gfx_pt_func_cpu(int s, int m, int c, int d)
if (func) return func;
}
#endif
#ifdef BUILD_C
cpu = CPU_C;
func = op_add_rel_pt_funcs[s][m][c][d][cpu];
if (func) return func;
#endif
return func;
}

View File

@ -1,6 +1,5 @@
/* blend color -> dst */
#ifdef BUILD_C
static void
_op_blend_c_dp(DATA32 *s __UNUSED__, DATA8 *m __UNUSED__, DATA32 c, DATA32 *d, int l) {
DATA32 *e, a = 256 - (c >> 24);
@ -25,9 +24,7 @@ init_blend_color_span_funcs_c(void)
op_blend_span_funcs[SP_N][SM_N][SC][DP_AN][CPU_C] = _op_blend_c_dpan;
op_blend_span_funcs[SP_N][SM_N][SC_AA][DP_AN][CPU_C] = _op_blend_caa_dpan;
}
#endif
#ifdef BUILD_C
static void
_op_blend_pt_c_dp(DATA32 s, DATA8 m __UNUSED__, DATA32 c, DATA32 *d) {
s = 256 - (c >> 24);
@ -51,13 +48,11 @@ init_blend_color_pt_funcs_c(void)
op_blend_pt_funcs[SP_N][SM_N][SC][DP_AN][CPU_C] = _op_blend_pt_c_dpan;
op_blend_pt_funcs[SP_N][SM_N][SC_AA][DP_AN][CPU_C] = _op_blend_pt_caa_dpan;
}
#endif
/*-----*/
/* blend_rel color -> dst */
#ifdef BUILD_C
static void
_op_blend_rel_c_dp(DATA32 *s __UNUSED__, DATA8 *m __UNUSED__, DATA32 c, DATA32 *d, int l) {
DATA32 *e;
@ -83,9 +78,7 @@ init_blend_rel_color_span_funcs_c(void)
op_blend_rel_span_funcs[SP_N][SM_N][SC][DP_AN][CPU_C] = _op_blend_rel_c_dpan;
op_blend_rel_span_funcs[SP_N][SM_N][SC_AA][DP_AN][CPU_C] = _op_blend_rel_caa_dpan;
}
#endif
#ifdef BUILD_C
static void
_op_blend_rel_pt_c_dp(DATA32 s, DATA8 m __UNUSED__, DATA32 c, DATA32 *d) {
s = *d >> 24;
@ -106,4 +99,3 @@ init_blend_rel_color_pt_funcs_c(void)
op_blend_rel_pt_funcs[SP_N][SM_N][SC][DP_AN][CPU_C] = _op_blend_rel_pt_c_dpan;
op_blend_rel_pt_funcs[SP_N][SM_N][SC_AA][DP_AN][CPU_C] = _op_blend_rel_pt_caa_dpan;
}
#endif

View File

@ -1,6 +1,5 @@
/* blend mask x color -> dst */
#ifdef BUILD_C
static void
_op_blend_mas_c_dp(DATA32 *s __UNUSED__, DATA8 *m, DATA32 c, DATA32 *d, int l) {
DATA32 *e;
@ -71,9 +70,7 @@ init_blend_mask_color_span_funcs_c(void)
op_blend_span_funcs[SP_N][SM_AS][SC_AN][DP_AN][CPU_C] = _op_blend_mas_can_dpan;
op_blend_span_funcs[SP_N][SM_AS][SC_AA][DP_AN][CPU_C] = _op_blend_mas_caa_dpan;
}
#endif
#ifdef BUILD_C
static void
_op_blend_pt_mas_c_dp(DATA32 s, DATA8 m, DATA32 c, DATA32 *d) {
s = MUL_SYM(m, c);
@ -107,13 +104,11 @@ init_blend_mask_color_pt_funcs_c(void)
op_blend_pt_funcs[SP_N][SM_AS][SC_AN][DP_AN][CPU_C] = _op_blend_pt_mas_can_dpan;
op_blend_pt_funcs[SP_N][SM_AS][SC_AA][DP_AN][CPU_C] = _op_blend_pt_mas_caa_dpan;
}
#endif
/*-----*/
/* blend_rel mask x color --> dst */
#ifdef BUILD_C
static void
_op_blend_rel_mas_c_dp(DATA32 *s __UNUSED__, DATA8 *m, DATA32 c, DATA32 *d, int l) {
DATA32 *e;
@ -150,9 +145,7 @@ init_blend_rel_mask_color_span_funcs_c(void)
op_blend_rel_span_funcs[SP_N][SM_AS][SC_AN][DP_AN][CPU_C] = _op_blend_rel_mas_can_dpan;
op_blend_rel_span_funcs[SP_N][SM_AS][SC_AA][DP_AN][CPU_C] = _op_blend_rel_mas_caa_dpan;
}
#endif
#ifdef BUILD_C
static void
_op_blend_rel_pt_mas_c_dp(DATA32 s, DATA8 m, DATA32 c, DATA32 *d) {
s = MUL_SYM(m, c);
@ -182,4 +175,3 @@ init_blend_rel_mask_color_pt_funcs_c(void)
op_blend_rel_pt_funcs[SP_N][SM_AS][SC_AN][DP_AN][CPU_C] = _op_blend_rel_pt_mas_can_dpan;
op_blend_rel_pt_funcs[SP_N][SM_AS][SC_AA][DP_AN][CPU_C] = _op_blend_rel_pt_mas_caa_dpan;
}
#endif

View File

@ -1,6 +1,5 @@
/* blend pixel --> dst */
#ifdef BUILD_C
static void
_op_blend_p_dp(DATA32 *s, DATA8 *m __UNUSED__, DATA32 c __UNUSED__, DATA32 *d, int l) {
DATA32 *e;
@ -52,9 +51,7 @@ init_blend_pixel_span_funcs_c(void)
op_blend_span_funcs[SP_AS][SM_N][SC_N][DP_AN][CPU_C] = _op_blend_pas_dpan;
op_blend_span_funcs[SP_AN][SM_N][SC_N][DP_AN][CPU_C] = _op_blend_pan_dpan;
}
#endif
#ifdef BUILD_C
static void
_op_blend_pt_p_dp(DATA32 s, DATA8 m __UNUSED__, DATA32 c, DATA32 *d) {
c = 256 - (s >> 24);
@ -79,13 +76,11 @@ init_blend_pixel_pt_funcs_c(void)
op_blend_pt_funcs[SP_AS][SM_N][SC_N][DP_AN][CPU_C] = _op_blend_pt_pas_dpan;
op_blend_pt_funcs[SP_AN][SM_N][SC_N][DP_AN][CPU_C] = _op_blend_pt_pan_dpan;
}
#endif
/*-----*/
/* blend_rel pixel -> dst */
#ifdef BUILD_C
static void
_op_blend_rel_p_dp(DATA32 *s, DATA8 *m __UNUSED__, DATA32 c, DATA32 *d, int l) {
DATA32 *e;
@ -128,9 +123,7 @@ init_blend_rel_pixel_span_funcs_c(void)
op_blend_rel_span_funcs[SP_AS][SM_N][SC_N][DP_AN][CPU_C] = _op_blend_rel_pas_dpan;
op_blend_rel_span_funcs[SP_AN][SM_N][SC_N][DP_AN][CPU_C] = _op_blend_rel_pan_dpan;
}
#endif
#ifdef BUILD_C
static void
_op_blend_rel_pt_p_dp(DATA32 s, DATA8 m __UNUSED__, DATA32 c, DATA32 *d) {
c = 256 - (s >> 24);
@ -159,4 +152,3 @@ init_blend_rel_pixel_pt_funcs_c(void)
op_blend_rel_pt_funcs[SP_AS][SM_N][SC_N][DP_AN][CPU_C] = _op_blend_rel_pt_pas_dpan;
op_blend_rel_pt_funcs[SP_AN][SM_N][SC_N][DP_AN][CPU_C] = _op_blend_rel_pt_pan_dpan;
}
#endif

View File

@ -1,6 +1,5 @@
/* blend pixel x color --> dst */
#ifdef BUILD_C
static void
_op_blend_p_c_dp(DATA32 *s, DATA8 *m __UNUSED__, DATA32 c, DATA32 *d, int l) {
DATA32 *e;
@ -114,9 +113,7 @@ init_blend_pixel_color_span_funcs_c(void)
op_blend_span_funcs[SP_AS][SM_N][SC_AA][DP_AN][CPU_C] = _op_blend_pas_caa_dpan;
op_blend_span_funcs[SP_AN][SM_N][SC_AA][DP_AN][CPU_C] = _op_blend_pan_caa_dpan;
}
#endif
#ifdef BUILD_C
static void
_op_blend_pt_p_c_dp(DATA32 s, DATA8 m __UNUSED__, DATA32 c, DATA32 *d) {
s = MUL4_SYM(c, s);
@ -166,13 +163,11 @@ init_blend_pixel_color_pt_funcs_c(void)
op_blend_pt_funcs[SP_AS][SM_N][SC_AA][DP_AN][CPU_C] = _op_blend_pt_pas_caa_dpan;
op_blend_pt_funcs[SP_AN][SM_N][SC_AA][DP_AN][CPU_C] = _op_blend_pt_pan_caa_dpan;
}
#endif
/*-----*/
/* blend_rel pixel x color -> dst */
#ifdef BUILD_C
static void
_op_blend_rel_p_c_dp(DATA32 *s, DATA8 *m __UNUSED__, DATA32 c, DATA32 *d, int l) {
DATA32 *e;
@ -229,9 +224,7 @@ init_blend_rel_pixel_color_span_funcs_c(void)
op_blend_rel_span_funcs[SP_AS][SM_N][SC_AA][DP_AN][CPU_C] = _op_blend_rel_pas_caa_dpan;
op_blend_rel_span_funcs[SP_AN][SM_N][SC_AA][DP_AN][CPU_C] = _op_blend_rel_pan_caa_dpan;
}
#endif
#ifdef BUILD_C
static void
_op_blend_rel_pt_p_c_dp(DATA32 s, DATA8 m __UNUSED__, DATA32 c, DATA32 *d) {
s = MUL4_SYM(c, s);
@ -281,4 +274,3 @@ init_blend_rel_pixel_color_pt_funcs_c(void)
op_blend_rel_pt_funcs[SP_AS][SM_N][SC_AA][DP_AN][CPU_C] = _op_blend_rel_pt_pas_caa_dpan;
op_blend_rel_pt_funcs[SP_AN][SM_N][SC_AA][DP_AN][CPU_C] = _op_blend_rel_pt_pan_caa_dpan;
}
#endif

View File

@ -1,6 +1,5 @@
/* blend pixel x mask --> dst */
#ifdef BUILD_C
static void
_op_blend_p_mas_dp(DATA32 *s, DATA8 *m, DATA32 c, DATA32 *d, int l) {
DATA32 *e;
@ -88,9 +87,7 @@ init_blend_pixel_mask_span_funcs_c(void)
op_blend_span_funcs[SP_AS][SM_AS][SC_N][DP_AN][CPU_C] = _op_blend_pas_mas_dpan;
op_blend_span_funcs[SP_AN][SM_AS][SC_N][DP_AN][CPU_C] = _op_blend_pan_mas_dpan;
}
#endif
#ifdef BUILD_C
static void
_op_blend_pt_p_mas_dp(DATA32 s, DATA8 m, DATA32 c, DATA32 *d) {
s = MUL_SYM(m, s);
@ -120,13 +117,11 @@ init_blend_pixel_mask_pt_funcs_c(void)
op_blend_pt_funcs[SP_AS][SM_AS][SC_N][DP_AN][CPU_C] = _op_blend_pt_pas_mas_dpan;
op_blend_pt_funcs[SP_AN][SM_AS][SC_N][DP_AN][CPU_C] = _op_blend_pt_pan_mas_dpan;
}
#endif
/*-----*/
/* blend_rel pixel x mask -> dst */
#ifdef BUILD_C
static void
_op_blend_rel_p_mas_dp(DATA32 *s, DATA8 *m, DATA32 c, DATA32 *d, int l) {
DATA32 *e;
@ -158,9 +153,7 @@ init_blend_rel_pixel_mask_span_funcs_c(void)
op_blend_rel_span_funcs[SP_AS][SM_AS][SC_N][DP_AN][CPU_C] = _op_blend_rel_pas_mas_dpan;
op_blend_rel_span_funcs[SP_AN][SM_AS][SC_N][DP_AN][CPU_C] = _op_blend_rel_pan_mas_dpan;
}
#endif
#ifdef BUILD_C
static void
_op_blend_rel_pt_p_mas_dp(DATA32 s, DATA8 m, DATA32 c, DATA32 *d) {
s = MUL_SYM(m, s);
@ -186,4 +179,3 @@ init_blend_rel_pixel_mask_pt_funcs_c(void)
op_blend_rel_pt_funcs[SP_AS][SM_AS][SC_N][DP_AN][CPU_C] = _op_blend_rel_pt_pas_mas_dpan;
op_blend_rel_pt_funcs[SP_AN][SM_AS][SC_N][DP_AN][CPU_C] = _op_blend_rel_pt_pan_mas_dpan;
}
#endif

View File

@ -129,7 +129,6 @@ op_blend_init(void)
init_blend_color_pt_funcs_neon();
init_blend_mask_color_pt_funcs_neon();
#endif
#ifdef BUILD_C
init_blend_pixel_span_funcs_c();
init_blend_pixel_color_span_funcs_c();
init_blend_pixel_mask_span_funcs_c();
@ -141,7 +140,6 @@ op_blend_init(void)
init_blend_pixel_mask_pt_funcs_c();
init_blend_color_pt_funcs_c();
init_blend_mask_color_pt_funcs_c();
#endif
}
static void
@ -178,11 +176,9 @@ blend_gfx_span_func_cpu(int s, int m, int c, int d)
if (func) return func;
}
#endif
#ifdef BUILD_C
cpu = CPU_C;
func = op_blend_span_funcs[s][m][c][d][cpu];
if (func) return func;
#endif
return func;
}
@ -302,11 +298,9 @@ blend_gfx_pt_func_cpu(int s, int m, int c, int d)
if (func) return func;
}
#endif
#ifdef BUILD_C
cpu = CPU_C;
func = op_blend_pt_funcs[s][m][c][d][cpu];
if (func) return func;
#endif
return func;
}
@ -420,7 +414,6 @@ op_blend_rel_init(void)
init_blend_rel_color_pt_funcs_neon();
init_blend_rel_mask_color_pt_funcs_neon();
#endif
#ifdef BUILD_C
init_blend_rel_pixel_span_funcs_c();
init_blend_rel_pixel_color_span_funcs_c();
init_blend_rel_pixel_mask_span_funcs_c();
@ -432,7 +425,6 @@ op_blend_rel_init(void)
init_blend_rel_pixel_mask_pt_funcs_c();
init_blend_rel_color_pt_funcs_c();
init_blend_rel_mask_color_pt_funcs_c();
#endif
}
static void
@ -469,11 +461,9 @@ blend_rel_gfx_span_func_cpu(int s, int m, int c, int d)
if (func) return func;
}
#endif
#ifdef BUILD_C
cpu = CPU_C;
func = op_blend_rel_span_funcs[s][m][c][d][cpu];
if (func) return func;
#endif
return func;
}
@ -588,11 +578,9 @@ blend_rel_gfx_pt_func_cpu(int s, int m, int c, int d)
if (func) return func;
}
#endif
#ifdef BUILD_C
cpu = CPU_C;
func = op_blend_rel_pt_funcs[s][m][c][d][cpu];
if (func) return func;
#endif
return func;
}

View File

@ -1,6 +1,5 @@
/* copy color --> dst */
#ifdef BUILD_C
static void
_op_copy_c_dp(DATA32 *s __UNUSED__, DATA8 *m __UNUSED__, DATA32 c, DATA32 *d, int l) {
DATA32 *e;
@ -33,9 +32,7 @@ init_copy_color_span_funcs_c(void)
op_copy_span_funcs[SP_N][SM_N][SC_AN][DP_AN][CPU_C] = _op_copy_can_dpan;
op_copy_span_funcs[SP_N][SM_N][SC_AA][DP_AN][CPU_C] = _op_copy_caa_dpan;
}
#endif
#ifdef BUILD_C
static void
_op_copy_pt_c_dp(DATA32 s __UNUSED__, DATA8 m __UNUSED__, DATA32 c, DATA32 *d) {
*d = c;
@ -63,13 +60,11 @@ init_copy_color_pt_funcs_c(void)
op_copy_pt_funcs[SP_N][SM_N][SC_AN][DP_AN][CPU_C] = _op_copy_pt_can_dpan;
op_copy_pt_funcs[SP_N][SM_N][SC_AA][DP_AN][CPU_C] = _op_copy_pt_caa_dpan;
}
#endif
/*-----*/
/* copy_rel color --> dst */
#ifdef BUILD_C
static void
_op_copy_rel_c_dp(DATA32 *s __UNUSED__, DATA8 *m __UNUSED__, DATA32 c, DATA32 *d, int l) {
DATA32 *e;
@ -103,9 +98,7 @@ init_copy_rel_color_span_funcs_c(void)
op_copy_rel_span_funcs[SP_N][SM_N][SC_AN][DP_AN][CPU_C] = _op_copy_rel_can_dpan;
op_copy_rel_span_funcs[SP_N][SM_N][SC_AA][DP_AN][CPU_C] = _op_copy_rel_caa_dpan;
}
#endif
#ifdef BUILD_C
static void
_op_copy_rel_pt_c_dp(DATA32 s, DATA8 m __UNUSED__, DATA32 c, DATA32 *d) {
s = 1 + (*d >> 24);
@ -135,4 +128,4 @@ init_copy_rel_color_pt_funcs_c(void)
op_copy_rel_pt_funcs[SP_N][SM_N][SC_AN][DP_AN][CPU_C] = _op_copy_rel_pt_can_dpan;
op_copy_rel_pt_funcs[SP_N][SM_N][SC_AA][DP_AN][CPU_C] = _op_copy_rel_pt_caa_dpan;
}
#endif

View File

@ -1,6 +1,5 @@
/* copy mask x color -> dst */
#ifdef BUILD_C
static void
_op_copy_mas_c_dp(DATA32 *s __UNUSED__, DATA8 *m, DATA32 c, DATA32 *d, int l) {
DATA32 *e;
@ -46,9 +45,7 @@ init_copy_mask_color_span_funcs_c(void)
op_copy_span_funcs[SP_N][SM_AS][SC_AN][DP_AN][CPU_C] = _op_copy_mas_can_dpan;
op_copy_span_funcs[SP_N][SM_AS][SC_AA][DP_AN][CPU_C] = _op_copy_mas_caa_dpan;
}
#endif
#ifdef BUILD_C
static void
_op_copy_pt_mas_c_dp(DATA32 s __UNUSED__, DATA8 m, DATA32 c, DATA32 *d) {
*d = INTERP_256(m + 1, c, *d);
@ -77,13 +74,11 @@ init_copy_mask_color_pt_funcs_c(void)
op_copy_pt_funcs[SP_N][SM_AS][SC_AN][DP_AN][CPU_C] = _op_copy_pt_mas_can_dpan;
op_copy_pt_funcs[SP_N][SM_AS][SC_AA][DP_AN][CPU_C] = _op_copy_pt_mas_caa_dpan;
}
#endif
/*-----*/
/* copy_rel mask x color -> dst */
#ifdef BUILD_C
static void
_op_copy_rel_mas_c_dp(DATA32 *s __UNUSED__, DATA8 *m, DATA32 c, DATA32 *d, int l) {
DATA32 *e;
@ -135,9 +130,7 @@ init_copy_rel_mask_color_span_funcs_c(void)
op_copy_rel_span_funcs[SP_N][SM_AS][SC_AN][DP_AN][CPU_C] = _op_copy_rel_mas_can_dpan;
op_copy_rel_span_funcs[SP_N][SM_AS][SC_AA][DP_AN][CPU_C] = _op_copy_rel_mas_caa_dpan;
}
#endif
#ifdef BUILD_C
static void
_op_copy_rel_pt_mas_c_dp(DATA32 s, DATA8 m, DATA32 c, DATA32 *d) {
s = 1 + (*d >> 24);
@ -167,4 +160,3 @@ init_copy_rel_mask_color_pt_funcs_c(void)
op_copy_rel_pt_funcs[SP_N][SM_AS][SC_AN][DP_AN][CPU_C] = _op_copy_rel_pt_mas_can_dpan;
op_copy_rel_pt_funcs[SP_N][SM_AS][SC_AA][DP_AN][CPU_C] = _op_copy_rel_pt_mas_caa_dpan;
}
#endif

View File

@ -1,6 +1,5 @@
/* copy pixel --> dst */
#ifdef BUILD_C
static void
_op_copy_p_dp(DATA32 *s, DATA8 *m __UNUSED__, DATA32 c __UNUSED__, DATA32 *d, int l) {
memcpy(d, s, l * sizeof(DATA32));
@ -24,9 +23,7 @@ init_copy_pixel_span_funcs_c(void)
op_copy_span_funcs[SP_AN][SM_N][SC_N][DP_AN][CPU_C] = _op_copy_pan_dpan;
op_copy_span_funcs[SP_AS][SM_N][SC_N][DP_AN][CPU_C] = _op_copy_pas_dpan;
}
#endif
#ifdef BUILD_C
static void
_op_copy_pt_p_dp(DATA32 s, DATA8 m __UNUSED__, DATA32 c __UNUSED__, DATA32 *d) {
*d = s;
@ -50,13 +47,11 @@ init_copy_pixel_pt_funcs_c(void)
op_copy_pt_funcs[SP_AN][SM_N][SC_N][DP_AN][CPU_C] = _op_copy_pt_pan_dpan;
op_copy_pt_funcs[SP_AS][SM_N][SC_N][DP_AN][CPU_C] = _op_copy_pt_pas_dpan;
}
#endif
/*-----*/
/* copy_rel pixel --> dst */
#ifdef BUILD_C
static void
_op_copy_rel_p_dp(DATA32 *s, DATA8 *m __UNUSED__, DATA32 c __UNUSED__, DATA32 *d, int l) {
DATA32 *e;
@ -86,9 +81,7 @@ init_copy_rel_pixel_span_funcs_c(void)
op_copy_rel_span_funcs[SP_AN][SM_N][SC_N][DP_AN][CPU_C] = _op_copy_rel_pan_dpan;
op_copy_rel_span_funcs[SP_AS][SM_N][SC_N][DP_AN][CPU_C] = _op_copy_rel_pas_dpan;
}
#endif
#ifdef BUILD_C
static void
_op_copy_rel_pt_p_dp(DATA32 s, DATA8 m __UNUSED__, DATA32 c, DATA32 *d) {
c = 1 + (*d >> 24);
@ -114,4 +107,3 @@ init_copy_rel_pixel_pt_funcs_c(void)
op_copy_rel_pt_funcs[SP_AN][SM_N][SC_N][DP_AN][CPU_C] = _op_copy_rel_pt_pan_dpan;
op_copy_rel_pt_funcs[SP_AS][SM_N][SC_N][DP_AN][CPU_C] = _op_copy_rel_pt_pas_dpan;
}
#endif

View File

@ -1,6 +1,5 @@
/* copy pixel x color --> dst */
#ifdef BUILD_C
static void
_op_copy_p_c_dp(DATA32 *s, DATA8 *m __UNUSED__, DATA32 c, DATA32 *d, int l) {
DATA32 *e;
@ -66,9 +65,7 @@ init_copy_pixel_color_span_funcs_c(void)
op_copy_span_funcs[SP_AS][SM_N][SC_AA][DP_AN][CPU_C] = _op_copy_pas_caa_dpan;
op_copy_span_funcs[SP_AN][SM_N][SC_AA][DP_AN][CPU_C] = _op_copy_pan_caa_dpan;
}
#endif
#ifdef BUILD_C
static void
_op_copy_pt_p_c_dp(DATA32 s, DATA8 m __UNUSED__, DATA32 c, DATA32 *d) {
*d = MUL4_SYM(c, s);
@ -121,13 +118,11 @@ init_copy_pixel_color_pt_funcs_c(void)
op_copy_pt_funcs[SP_AS][SM_N][SC_AA][DP_AN][CPU_C] = _op_copy_pt_pas_caa_dpan;
op_copy_pt_funcs[SP_AN][SM_N][SC_AA][DP_AN][CPU_C] = _op_copy_pt_pan_caa_dpan;
}
#endif
/*-----*/
/* copy_rel pixel x color --> dst */
#ifdef BUILD_C
static void
_op_copy_rel_p_c_dp(DATA32 *s, DATA8 *m __UNUSED__, DATA32 c, DATA32 *d, int l) {
DATA32 *e;
@ -182,9 +177,7 @@ init_copy_rel_pixel_color_span_funcs_c(void)
op_copy_rel_span_funcs[SP_AS][SM_N][SC_AA][DP_AN][CPU_C] = _op_copy_rel_pas_caa_dpan;
op_copy_rel_span_funcs[SP_AN][SM_N][SC_AA][DP_AN][CPU_C] = _op_copy_rel_pan_caa_dpan;
}
#endif
#ifdef BUILD_C
static void
_op_copy_rel_pt_p_c_dp(DATA32 s, DATA8 m __UNUSED__, DATA32 c, DATA32 *d) {
s = MUL4_SYM(c, s);
@ -233,4 +226,3 @@ init_copy_rel_pixel_color_pt_funcs_c(void)
op_copy_rel_pt_funcs[SP_AS][SM_N][SC_AA][DP_AN][CPU_C] = _op_copy_rel_pt_pas_caa_dpan;
op_copy_rel_pt_funcs[SP_AN][SM_N][SC_AA][DP_AN][CPU_C] = _op_copy_rel_pt_pan_caa_dpan;
}
#endif

View File

@ -1,6 +1,5 @@
/* copy pixel x mask --> dst */
#ifdef BUILD_C
static void
_op_copy_p_mas_dp(DATA32 *s, DATA8 *m, DATA32 c __UNUSED__, DATA32 *d, int l) {
DATA32 *e;
@ -43,9 +42,7 @@ init_copy_pixel_mask_span_funcs_c(void)
op_copy_span_funcs[SP_AN][SM_AS][SC_N][DP_AN][CPU_C] = _op_copy_pan_mas_dpan;
op_copy_span_funcs[SP_AS][SM_AS][SC_N][DP_AN][CPU_C] = _op_copy_pas_mas_dpan;
}
#endif
#ifdef BUILD_C
static void
_op_copy_pt_p_mas_dp(DATA32 s, DATA8 m, DATA32 c __UNUSED__, DATA32 *d) {
*d = INTERP_256(m + 1, s, *d);
@ -69,13 +66,11 @@ init_copy_pixel_mask_pt_funcs_c(void)
op_copy_pt_funcs[SP_AN][SM_AS][SC_N][DP_AN][CPU_C] = _op_copy_pt_pan_mas_dpan;
op_copy_pt_funcs[SP_AS][SM_AS][SC_N][DP_AN][CPU_C] = _op_copy_pt_pas_mas_dpan;
}
#endif
/*-----*/
/* copy_rel pixel x mask --> dst */
#ifdef BUILD_C
static void
_op_copy_rel_p_mas_dp(DATA32 *s, DATA8 *m, DATA32 c, DATA32 *d, int l) {
DATA32 *e;
@ -119,9 +114,7 @@ init_copy_rel_pixel_mask_span_funcs_c(void)
op_copy_rel_span_funcs[SP_AN][SM_AS][SC_N][DP_AN][CPU_C] = _op_copy_rel_pan_mas_dpan;
op_copy_rel_span_funcs[SP_AS][SM_AS][SC_N][DP_AN][CPU_C] = _op_copy_rel_pas_mas_dpan;
}
#endif
#ifdef BUILD_C
static void
_op_copy_rel_pt_p_mas_dp(DATA32 s, DATA8 m, DATA32 c, DATA32 *d) {
c = MUL_SYM(*d >> 24, s);
@ -147,4 +140,3 @@ init_copy_rel_pixel_mask_pt_funcs_c(void)
op_copy_rel_pt_funcs[SP_AN][SM_AS][SC_N][DP_AN][CPU_C] = _op_copy_rel_pt_pan_mas_dpan;
op_copy_rel_pt_funcs[SP_AS][SM_AS][SC_N][DP_AN][CPU_C] = _op_copy_rel_pt_pas_mas_dpan;
}
#endif

View File

@ -126,7 +126,6 @@ op_copy_init(void)
init_copy_color_pt_funcs_neon();
init_copy_mask_color_pt_funcs_neon();
#endif
#ifdef BUILD_C
init_copy_pixel_span_funcs_c();
init_copy_pixel_color_span_funcs_c();
init_copy_pixel_mask_span_funcs_c();
@ -138,7 +137,6 @@ op_copy_init(void)
init_copy_pixel_mask_pt_funcs_c();
init_copy_color_pt_funcs_c();
init_copy_mask_color_pt_funcs_c();
#endif
}
static void
@ -167,11 +165,9 @@ copy_gfx_span_func_cpu(int s, int m, int c, int d)
if (func) return func;
}
#endif
#ifdef BUILD_C
cpu = CPU_C;
func = op_copy_span_funcs[s][m][c][d][cpu];
if (func) return func;
#endif
return func;
}
@ -285,11 +281,9 @@ copy_gfx_pt_func_cpu(int s, int m, int c, int d)
if (func) return func;
}
#endif
#ifdef BUILD_C
cpu = CPU_C;
func = op_copy_pt_funcs[s][m][c][d][cpu];
if (func) return func;
#endif
return func;
}
@ -414,7 +408,6 @@ op_copy_rel_init(void)
init_copy_rel_color_pt_funcs_neon();
init_copy_rel_mask_color_pt_funcs_neon();
#endif
#ifdef BUILD_C
init_copy_rel_pixel_span_funcs_c();
init_copy_rel_pixel_color_span_funcs_c();
init_copy_rel_pixel_mask_span_funcs_c();
@ -426,7 +419,6 @@ op_copy_rel_init(void)
init_copy_rel_pixel_mask_pt_funcs_c();
init_copy_rel_color_pt_funcs_c();
init_copy_rel_mask_color_pt_funcs_c();
#endif
}
static void
@ -455,11 +447,9 @@ copy_rel_gfx_span_func_cpu(int s, int m, int c, int d)
if (func) return func;
}
#endif
#ifdef BUILD_C
cpu = CPU_C;
func = op_copy_rel_span_funcs[s][m][c][d][cpu];
if (func) return func;
#endif
return func;
}
@ -574,11 +564,9 @@ copy_rel_gfx_pt_func_cpu(int s, int m, int c, int d)
if (func) return func;
}
#endif
#ifdef BUILD_C
cpu = CPU_C;
func = op_copy_rel_pt_funcs[s][m][c][d][cpu];
if (func) return func;
#endif
return func;
}

View File

@ -1,6 +1,5 @@
/* mask color --> dst */
#ifdef BUILD_C
static void
_op_mask_c_dp(DATA32 *s __UNUSED__, DATA8 *m __UNUSED__, DATA32 c, DATA32 *d, int l) {
DATA32 *e = d + l;
@ -24,9 +23,7 @@ init_mask_color_span_funcs_c(void)
op_mask_span_funcs[SP_N][SM_N][SC][DP_AN][CPU_C] = _op_mask_c_dpan;
op_mask_span_funcs[SP_N][SM_N][SC_AA][DP_AN][CPU_C] = _op_mask_caa_dpan;
}
#endif
#ifdef BUILD_C
static void
_op_mask_pt_c_dp(DATA32 s __UNUSED__, DATA8 m __UNUSED__, DATA32 c, DATA32 *d) {
*d = MUL_SYM(c >> 24, *d);
@ -46,4 +43,4 @@ init_mask_color_pt_funcs_c(void)
op_mask_pt_funcs[SP_N][SM_N][SC][DP_AN][CPU_C] = _op_mask_pt_c_dpan;
op_mask_pt_funcs[SP_N][SM_N][SC_AA][DP_AN][CPU_C] = _op_mask_pt_caa_dpan;
}
#endif

View File

@ -1,6 +1,5 @@
/* mask mask x color -> dst */
#ifdef BUILD_C
static void
_op_mask_mas_c_dp(DATA32 *s __UNUSED__, DATA8 *m, DATA32 c, DATA32 *d, int l) {
DATA32 *e = d + l;
@ -37,9 +36,7 @@ init_mask_mask_color_span_funcs_c(void)
op_mask_span_funcs[SP_N][SM_AS][SC][DP_AN][CPU_C] = _op_mask_mas_c_dpan;
op_mask_span_funcs[SP_N][SM_AS][SC_AA][DP_AN][CPU_C] = _op_mask_mas_caa_dpan;
}
#endif
#ifdef BUILD_C
static void
_op_mask_pt_mas_c_dp(DATA32 s __UNUSED__, DATA8 m, DATA32 c, DATA32 *d) {
c = 256 - (((256 - (c >> 24)) * m) >> 8);
@ -60,4 +57,3 @@ init_mask_mask_color_pt_funcs_c(void)
op_mask_pt_funcs[SP_N][SM_AS][SC][DP_AN][CPU_C] = _op_mask_pt_mas_c_dpan;
op_mask_pt_funcs[SP_N][SM_AS][SC_AA][DP_AN][CPU_C] = _op_mask_pt_mas_caa_dpan;
}
#endif

View File

@ -1,6 +1,5 @@
/* mask pixel --> dst */
#ifdef BUILD_C
static void
_op_mask_p_dp(DATA32 *s, DATA8 *m __UNUSED__, DATA32 c __UNUSED__, DATA32 *d, int l) {
DATA32 *e = d + l;
@ -23,9 +22,7 @@ init_mask_pixel_span_funcs_c(void)
op_mask_span_funcs[SP][SM_N][SC_N][DP_AN][CPU_C] = _op_mask_p_dpan;
op_mask_span_funcs[SP_AS][SM_N][SC_N][DP_AN][CPU_C] = _op_mask_pas_dpan;
}
#endif
#ifdef BUILD_C
static void
_op_mask_pt_p_dp(DATA32 s, DATA8 m __UNUSED__, DATA32 c __UNUSED__, DATA32 *d) {
*d = MUL_SYM(s >> 24, *d);
@ -45,4 +42,3 @@ init_mask_pixel_pt_funcs_c(void)
op_mask_pt_funcs[SP][SM_N][SC_N][DP_AN][CPU_C] = _op_mask_pt_p_dpan;
op_mask_pt_funcs[SP_AS][SM_N][SC_N][DP_AN][CPU_C] = _op_mask_pt_pas_dpan;
}
#endif

View File

@ -1,6 +1,5 @@
/* mask pixel x color --> dst */
#ifdef BUILD_C
static void
_op_mask_p_c_dp(DATA32 *s, DATA8 *m __UNUSED__, DATA32 c, DATA32 *d, int l) {
DATA32 *e = d + l;
@ -50,9 +49,7 @@ init_mask_pixel_color_span_funcs_c(void)
op_mask_span_funcs[SP_AS][SM_N][SC_AA][DP_AN][CPU_C] = _op_mask_pas_caa_dpan;
op_mask_span_funcs[SP_AN][SM_N][SC_AA][DP_AN][CPU_C] = _op_mask_pan_caa_dpan;
}
#endif
#ifdef BUILD_C
static void
_op_mask_pt_p_c_dp(DATA32 s, DATA8 m __UNUSED__, DATA32 c, DATA32 *d) {
c = 1 + ((((c >> 24) * (s >> 24)) + 255) >> 8);
@ -97,4 +94,3 @@ init_mask_pixel_color_pt_funcs_c(void)
op_mask_pt_funcs[SP_AS][SM_N][SC_AA][DP_AN][CPU_C] = _op_mask_pt_pas_caa_dpan;
op_mask_pt_funcs[SP_AN][SM_N][SC_AA][DP_AN][CPU_C] = _op_mask_pt_pan_caa_dpan;
}
#endif

View File

@ -1,6 +1,5 @@
/* mask pixel x mask --> dst */
#ifdef BUILD_C
static void
_op_mask_p_mas_dp(DATA32 *s, DATA8 *m, DATA32 c __UNUSED__, DATA32 *d, int l) {
DATA32 *e = d + l;
@ -36,9 +35,7 @@ init_mask_pixel_mask_span_funcs_c(void)
op_mask_span_funcs[SP][SM_AS][SC_N][DP_AN][CPU_C] = _op_mask_p_mas_dpan;
op_mask_span_funcs[SP_AS][SM_AS][SC_N][DP_AN][CPU_C] = _op_mask_pas_mas_dpan;
}
#endif
#ifdef BUILD_C
static void
_op_mask_pt_p_mas_dp(DATA32 s, DATA8 m, DATA32 c __UNUSED__, DATA32 *d) {
s = 256 - (((256 - (s >> 24)) * m) >> 8);
@ -59,4 +56,3 @@ init_mask_pixel_mask_pt_funcs_c(void)
op_mask_pt_funcs[SP][SM_AS][SC_N][DP_AN][CPU_C] = _op_mask_pt_p_mas_dpan;
op_mask_pt_funcs[SP_AS][SM_AS][SC_N][DP_AN][CPU_C] = _op_mask_pt_pas_mas_dpan;
}
#endif

View File

@ -68,7 +68,6 @@ op_mask_init(void)
init_mask_color_pt_funcs_mmx();
init_mask_mask_color_pt_funcs_mmx();
#endif
#ifdef BUILD_C
init_mask_pixel_span_funcs_c();
init_mask_pixel_color_span_funcs_c();
init_mask_pixel_mask_span_funcs_c();
@ -80,7 +79,6 @@ op_mask_init(void)
init_mask_pixel_mask_pt_funcs_c();
init_mask_color_pt_funcs_c();
init_mask_mask_color_pt_funcs_c();
#endif
}
static void
@ -101,11 +99,9 @@ mask_gfx_span_func_cpu(int s, int m, int c, int d)
if (func) return func;
}
#endif
#ifdef BUILD_C
cpu = CPU_C;
func = op_mask_span_funcs[s][m][c][d][cpu];
if (func) return func;
#endif
return func;
}
@ -211,11 +207,9 @@ mask_gfx_pt_func_cpu(int s, int m, int c, int d)
if (func) return func;
}
#endif
#ifdef BUILD_C
cpu = CPU_C;
func = op_mask_pt_funcs[s][m][c][d][cpu];
if (func) return func;
#endif
return func;
}

View File

@ -1,6 +1,5 @@
/* mul color --> dst */
#ifdef BUILD_C
static void
_op_mul_c_dp(DATA32 *s __UNUSED__, DATA8 *m __UNUSED__, DATA32 c, DATA32 *d, int l) {
DATA32 *e = d + l;
@ -35,9 +34,7 @@ init_mul_color_span_funcs_c(void)
op_mul_span_funcs[SP_N][SM_N][SC_AN][DP_AN][CPU_C] = _op_mul_can_dpan;
op_mul_span_funcs[SP_N][SM_N][SC_AA][DP_AN][CPU_C] = _op_mul_caa_dpan;
}
#endif
#ifdef BUILD_C
static void
_op_mul_pt_c_dp(DATA32 s __UNUSED__, DATA8 m __UNUSED__, DATA32 c, DATA32 *d) {
*d = MUL4_SYM(c, *d);
@ -61,5 +58,3 @@ init_mul_color_pt_funcs_c(void)
op_mul_pt_funcs[SP_N][SM_N][SC_AN][DP_AN][CPU_C] = _op_mul_pt_can_dpan;
op_mul_pt_funcs[SP_N][SM_N][SC_AA][DP_AN][CPU_C] = _op_mul_pt_caa_dpan;
}
#endif

View File

@ -1,6 +1,5 @@
/* mul mask x color -> dst */
#ifdef BUILD_C
static void
_op_mul_mas_c_dp(DATA32 *s __UNUSED__, DATA8 *m, DATA32 c, DATA32 *d, int l) {
DATA32 *e = d + l, nc = ~c;
@ -41,9 +40,7 @@ init_mul_mask_color_span_funcs_c(void)
op_mul_span_funcs[SP_N][SM_AS][SC_AN][DP_AN][CPU_C] = _op_mul_mas_can_dpan;
op_mul_span_funcs[SP_N][SM_AS][SC_AA][DP_AN][CPU_C] = _op_mul_mas_caa_dpan;
}
#endif
#ifdef BUILD_C
static void
_op_mul_pt_mas_c_dp(DATA32 s __UNUSED__, DATA8 m, DATA32 c, DATA32 *d) {
c = ~c;
@ -69,4 +66,3 @@ init_mul_mask_color_pt_funcs_c(void)
op_mul_pt_funcs[SP_N][SM_AS][SC_AN][DP_AN][CPU_C] = _op_mul_pt_mas_can_dpan;
op_mul_pt_funcs[SP_N][SM_AS][SC_AA][DP_AN][CPU_C] = _op_mul_pt_mas_caa_dpan;
}
#endif

View File

@ -1,6 +1,5 @@
/* mul pixel --> dst */
#ifdef BUILD_C
static void
_op_mul_p_dp(DATA32 *s, DATA8 *m __UNUSED__, DATA32 c __UNUSED__, DATA32 *d, int l) {
DATA32 *e = d + l;
@ -27,9 +26,7 @@ init_mul_pixel_span_funcs_c(void)
op_mul_span_funcs[SP_AS][SM_N][SC_N][DP_AN][CPU_C] = _op_mul_pas_dpan;
op_mul_span_funcs[SP_AN][SM_N][SC_N][DP_AN][CPU_C] = _op_mul_pan_dpan;
}
#endif
#ifdef BUILD_C
static void
_op_mul_pt_p_dp(DATA32 s, DATA8 m __UNUSED__, DATA32 c __UNUSED__, DATA32 *d) {
*d = MUL4_SYM(s, *d);
@ -53,4 +50,3 @@ init_mul_pixel_pt_funcs_c(void)
op_mul_pt_funcs[SP_AS][SM_N][SC_N][DP_AN][CPU_C] = _op_mul_pt_pas_dpan;
op_mul_pt_funcs[SP_AN][SM_N][SC_N][DP_AN][CPU_C] = _op_mul_pt_pan_dpan;
}
#endif

View File

@ -1,6 +1,5 @@
/* mul pixel x color --> dst */
#ifdef BUILD_C
static void
_op_mul_p_c_dp(DATA32 *s, DATA8 *m __UNUSED__, DATA32 c, DATA32 *d, int l) {
DATA32 *e = d + l;
@ -64,9 +63,7 @@ init_mul_pixel_color_span_funcs_c(void)
op_mul_span_funcs[SP_AS][SM_N][SC_AA][DP_AN][CPU_C] = _op_mul_pas_caa_dpan;
op_mul_span_funcs[SP_AN][SM_N][SC_AA][DP_AN][CPU_C] = _op_mul_pan_caa_dpan;
}
#endif
#ifdef BUILD_C
static void
_op_mul_pt_p_c_dp(DATA32 s, DATA8 m __UNUSED__, DATA32 c, DATA32 *d) {
s = MUL4_SYM(c, s);
@ -119,4 +116,3 @@ init_mul_pixel_color_pt_funcs_c(void)
op_mul_pt_funcs[SP_AS][SM_N][SC_AA][DP_AN][CPU_C] = _op_mul_pt_pas_caa_dpan;
op_mul_pt_funcs[SP_AN][SM_N][SC_AA][DP_AN][CPU_C] = _op_mul_pt_pan_caa_dpan;
}
#endif

View File

@ -1,6 +1,5 @@
/* mul pixel x mask --> dst */
#ifdef BUILD_C
static void
_op_mul_p_mas_dp(DATA32 *s, DATA8 *m, DATA32 c, DATA32 *d, int l) {
DATA32 *e = d + l;
@ -86,9 +85,7 @@ init_mul_pixel_mask_span_funcs_c(void)
op_mul_span_funcs[SP_AS][SM_AS][SC_N][DP_AN][CPU_C] = _op_mul_pas_mas_dpan;
op_mul_span_funcs[SP_AN][SM_AS][SC_N][DP_AN][CPU_C] = _op_mul_pan_mas_dpan;
}
#endif
#ifdef BUILD_C
static void
_op_mul_pt_p_mas_dp(DATA32 s, DATA8 m, DATA32 c __UNUSED__, DATA32 *d) {
s = ~s;
@ -114,4 +111,4 @@ init_mul_pixel_mask_pt_funcs_c(void)
op_mul_pt_funcs[SP_AS][SM_AS][SC_N][DP_AN][CPU_C] = _op_mul_pt_pas_mas_dpan;
op_mul_pt_funcs[SP_AN][SM_AS][SC_N][DP_AN][CPU_C] = _op_mul_pt_pan_mas_dpan;
}
#endif

View File

@ -67,7 +67,6 @@ op_mul_init(void)
init_mul_color_pt_funcs_mmx();
init_mul_mask_color_pt_funcs_mmx();
#endif
#ifdef BUILD_C
init_mul_pixel_span_funcs_c();
init_mul_pixel_color_span_funcs_c();
init_mul_pixel_mask_span_funcs_c();
@ -79,7 +78,6 @@ op_mul_init(void)
init_mul_pixel_mask_pt_funcs_c();
init_mul_color_pt_funcs_c();
init_mul_mask_color_pt_funcs_c();
#endif
}
static void
@ -100,11 +98,9 @@ mul_gfx_span_func_cpu(int s, int m, int c, int d)
if (func) return func;
}
#endif
#ifdef BUILD_C
cpu = CPU_C;
func = op_mul_span_funcs[s][m][c][d][cpu];
if (func) return func;
#endif
return func;
}
@ -210,11 +206,9 @@ mul_gfx_pt_func_cpu(int s, int m, int c, int d)
if (func) return func;
}
#endif
#ifdef BUILD_C
cpu = CPU_C;
func = op_mul_pt_funcs[s][m][c][d][cpu];
if (func) return func;
#endif
return func;
}

View File

@ -1,33 +1,25 @@
/* sub color -> dst */
#ifdef BUILD_C
static void
init_sub_color_span_funcs_c(void)
{
}
#endif
#ifdef BUILD_C
static void
init_sub_color_pt_funcs_c(void)
{
}
#endif
/*-----*/
/* sub_rel color -> dst */
#ifdef BUILD_C
static void
init_sub_rel_color_span_funcs_c(void)
{
}
#endif
#ifdef BUILD_C
static void
init_sub_rel_color_pt_funcs_c(void)
{
}
#endif

View File

@ -1,33 +1,25 @@
/* sub mask x color -> dst */
#ifdef BUILD_C
static void
init_sub_mask_color_span_funcs_c(void)
{
}
#endif
#ifdef BUILD_C
static void
init_sub_mask_color_pt_funcs_c(void)
{
}
#endif
/*-----*/
/* sub_rel mask x color -> dst */
#ifdef BUILD_C
static void
init_sub_rel_mask_color_span_funcs_c(void)
{
}
#endif
#ifdef BUILD_C
static void
init_sub_rel_mask_color_pt_funcs_c(void)
{
}
#endif

View File

@ -1,33 +1,25 @@
/* sub pixel --> dst */
#ifdef BUILD_C
static void
init_sub_pixel_span_funcs_c(void)
{
}
#endif
#ifdef BUILD_C
static void
init_sub_pixel_pt_funcs_c(void)
{
}
#endif
/*-----*/
/* sub_rel pixel --> dst */
#ifdef BUILD_C
static void
init_sub_rel_pixel_span_funcs_c(void)
{
}
#endif
#ifdef BUILD_C
static void
init_sub_rel_pixel_pt_funcs_c(void)
{
}
#endif

View File

@ -1,33 +1,25 @@
/* sub pixel x color --> dst */
#ifdef BUILD_C
static void
init_sub_pixel_color_span_funcs_c(void)
{
}
#endif
#ifdef BUILD_C
static void
init_sub_pixel_color_pt_funcs_c(void)
{
}
#endif
/*-----*/
/* sub_rel pixel x color --> dst */
#ifdef BUILD_C
static void
init_sub_rel_pixel_color_span_funcs_c(void)
{
}
#endif
#ifdef BUILD_C
static void
init_sub_rel_pixel_color_pt_funcs_c(void)
{
}
#endif

View File

@ -1,37 +1,29 @@
/* sub pixel x mask --> dst */
#ifdef BUILD_C
/* XXX: not used
static void
init_sub_pixel_mask_span_funcs_c(void)
{
}
*/
#endif
#ifdef BUILD_C
/* XXX: not used
static void
init_sub_pixel_mask_pt_funcs_c(void)
{
}
*/
#endif
/*-----*/
/* sub_rel pixel x mask --> dst */
#ifdef BUILD_C
static void
init_sub_rel_pixel_mask_span_funcs_c(void)
{
}
#endif
#ifdef BUILD_C
static void
init_sub_rel_pixel_mask_pt_funcs_c(void)
{
}
#endif

View File

@ -101,7 +101,6 @@ op_sub_init(void)
init_sub_color_pt_funcs_mmx();
init_sub_mask_color_pt_funcs_mmx();
#endif
#ifdef BUILD_C
init_sub_pixel_span_funcs_c();
init_sub_pixel_color_span_funcs_c();
init_sub_rel_pixel_mask_span_funcs_c();
@ -113,7 +112,6 @@ op_sub_init(void)
init_sub_rel_pixel_mask_pt_funcs_c();
init_sub_color_pt_funcs_c();
init_sub_mask_color_pt_funcs_c();
#endif
}
static void
@ -134,11 +132,9 @@ sub_gfx_span_func_cpu(int s, int m, int c, int d)
if (func) return func;
}
#endif
#ifdef BUILD_C
cpu = CPU_C;
func = op_sub_span_funcs[s][m][c][d][cpu];
if (func) return func;
#endif
return func;
}
@ -229,11 +225,9 @@ sub_gfx_pt_func_cpu(int s, int m, int c, int d)
if (func) return func;
}
#endif
#ifdef BUILD_C
cpu = CPU_C;
func = op_sub_pt_funcs[s][m][c][d][cpu];
if (func) return func;
#endif
return func;
}
@ -331,7 +325,6 @@ op_sub_rel_init(void)
init_sub_rel_color_pt_funcs_mmx();
init_sub_rel_mask_color_pt_funcs_mmx();
#endif
#ifdef BUILD_C
init_sub_rel_pixel_span_funcs_c();
init_sub_rel_pixel_color_span_funcs_c();
init_sub_rel_pixel_mask_span_funcs_c();
@ -343,7 +336,6 @@ op_sub_rel_init(void)
init_sub_rel_pixel_mask_pt_funcs_c();
init_sub_rel_color_pt_funcs_c();
init_sub_rel_mask_color_pt_funcs_c();
#endif
}
static void
@ -364,11 +356,9 @@ sub_rel_gfx_span_func_cpu(int s, int m, int c, int d)
if (func) return func;
}
#endif
#ifdef BUILD_C
cpu = CPU_C;
func = op_sub_rel_span_funcs[s][m][c][d][cpu];
if (func) return func;
#endif
return func;
}
@ -459,11 +449,9 @@ sub_rel_gfx_pt_func_cpu(int s, int m, int c, int d)
if (func) return func;
}
#endif
#ifdef BUILD_C
cpu = CPU_C;
func = op_sub_rel_pt_funcs[s][m][c][d][cpu];
if (func) return func;
#endif
return func;
}

View File

@ -137,13 +137,11 @@ evas_common_scale_rgba_in_to_out_clip_smooth(RGBA_Image *src, RGBA_Image *dst,
dst_region_w, dst_region_h);
else
# endif
# ifdef BUILD_C
evas_common_scale_rgba_in_to_out_clip_smooth_c(src, dst, dc,
src_region_x, src_region_y,
src_region_w, src_region_h,
dst_region_x, dst_region_y,
dst_region_w, dst_region_h);
# endif
src_region_x, src_region_y,
src_region_w, src_region_h,
dst_region_x, dst_region_y,
dst_region_w, dst_region_h);
return;
}
/* save out clip info */