Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/evas
Dir : e17/libs/evas/src/lib/engines/common/evas_op_mask
Modified Files:
op_mask_color_.c op_mask_color_i386.c op_mask_mask_color_.c
op_mask_pixel_.c op_mask_pixel_color_.c op_mask_pixel_i386.c
op_mask_pixel_mask_.c
Log Message:
same as previous commit.
===================================================================
RCS file:
/cvs/e/e17/libs/evas/src/lib/engines/common/evas_op_mask/op_mask_color_.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- op_mask_color_.c 2 May 2006 07:28:47 -0000 1.1
+++ op_mask_color_.c 30 Sep 2006 10:18:33 -0000 1.2
@@ -4,98 +4,48 @@
#ifdef BUILD_C
static void
-_op_mask_c_dp(DATA32 *s, DATA8 *m, DATA32 c, DATA32 *d, int l)
-{
+_op_mask_c_dp(DATA32 *s, DATA8 *m, DATA32 c, DATA32 *d, int l) {
DATA32 *e = d + l;
c = 1 + (c >> 24);
for (; d < e; d++) {
- *d = MUL_A_256(c, *d) + (*d & 0x00ffffff);
+ *d = MUL_256(c, *d);
}
}
-static void
-_op_mask_c_dpan(DATA32 *s, DATA8 *m, DATA32 c, DATA32 *d, int l)
-{
- DATA32 *e = d + l;
- c |= 0x00ffffff;
- for (; d < e; d++) {
- *d &= c;
- }
-}
-
-#define _op_mask_cn_dp NULL
-#define _op_mask_can_dp _op_mask_cn_dp
#define _op_mask_caa_dp _op_mask_c_dp
-#define _op_mask_cn_dpan _op_mask_cn_dp
-#define _op_mask_can_dpan _op_mask_can_dp
-#define _op_mask_caa_dpan _op_mask_c_dpan
-
-#define _op_mask_c_dpas _op_mask_c_dp
-#define _op_mask_cn_dpas _op_mask_cn_dp
-#define _op_mask_can_dpas _op_mask_can_dp
-#define _op_mask_caa_dpas _op_mask_caa_dp
+#define _op_mask_c_dpan _op_mask_c_dp
+#define _op_mask_caa_dpan _op_mask_caa_dp
static void
init_mask_color_span_funcs_c(void)
{
- op_mask_span_funcs[SP_N][SM_N][SC_N][DP][CPU_C] = _op_mask_cn_dp;
op_mask_span_funcs[SP_N][SM_N][SC][DP][CPU_C] = _op_mask_c_dp;
- op_mask_span_funcs[SP_N][SM_N][SC_AN][DP][CPU_C] = _op_mask_can_dp;
op_mask_span_funcs[SP_N][SM_N][SC_AA][DP][CPU_C] = _op_mask_caa_dp;
- op_mask_span_funcs[SP_N][SM_N][SC_N][DP_AN][CPU_C] = _op_mask_cn_dpan;
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_AN][DP_AN][CPU_C] = _op_mask_can_dpan;
op_mask_span_funcs[SP_N][SM_N][SC_AA][DP_AN][CPU_C] = _op_mask_caa_dpan;
-
- op_mask_span_funcs[SP_N][SM_N][SC_N][DP_AS][CPU_C] = _op_mask_cn_dpas;
- op_mask_span_funcs[SP_N][SM_N][SC][DP_AS][CPU_C] = _op_mask_c_dpas;
- op_mask_span_funcs[SP_N][SM_N][SC_AN][DP_AS][CPU_C] = _op_mask_can_dpas;
- op_mask_span_funcs[SP_N][SM_N][SC_AA][DP_AS][CPU_C] = _op_mask_caa_dpas;
}
#endif
#ifdef BUILD_C
static void
_op_mask_pt_c_dp(DATA32 s, DATA8 m, DATA32 c, DATA32 *d) {
- *d = MUL_A_SYM(c >> 24, *d) + (*d & 0x00ffffff);
-}
-
-static void
-_op_mask_pt_c_dpan(DATA32 s, DATA8 m, DATA32 c, DATA32 *d) {
- *d &= (c | 0x00ffffff);
+ *d = MUL_SYM(c >> 24, *d);
}
-#define _op_mask_pt_cn_dp NULL
-#define _op_mask_pt_can_dp _op_mask_pt_cn_dp
#define _op_mask_pt_caa_dp _op_mask_pt_c_dp
-#define _op_mask_pt_cn_dpan _op_mask_pt_cn_dp
-#define _op_mask_pt_can_dpan _op_mask_pt_can_dp
-#define _op_mask_pt_caa_dpan _op_mask_pt_c_dpan
-
-#define _op_mask_pt_c_dpas _op_mask_pt_c_dp
-#define _op_mask_pt_cn_dpas _op_mask_pt_cn_dp
-#define _op_mask_pt_can_dpas _op_mask_pt_can_dp
-#define _op_mask_pt_caa_dpas _op_mask_pt_caa_dp
+#define _op_mask_pt_c_dpan _op_mask_pt_c_dp
+#define _op_mask_pt_caa_dpan _op_mask_pt_caa_dp
static void
init_mask_color_pt_funcs_c(void)
{
- op_mask_pt_funcs[SP_N][SM_N][SC_N][DP][CPU_C] = _op_mask_pt_cn_dp;
op_mask_pt_funcs[SP_N][SM_N][SC][DP][CPU_C] = _op_mask_pt_c_dp;
- op_mask_pt_funcs[SP_N][SM_N][SC_AN][DP][CPU_C] = _op_mask_pt_can_dp;
op_mask_pt_funcs[SP_N][SM_N][SC_AA][DP][CPU_C] = _op_mask_pt_caa_dp;
- op_mask_pt_funcs[SP_N][SM_N][SC_N][DP_AN][CPU_C] = _op_mask_pt_cn_dpan;
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_AN][DP_AN][CPU_C] = _op_mask_pt_can_dpan;
op_mask_pt_funcs[SP_N][SM_N][SC_AA][DP_AN][CPU_C] = _op_mask_pt_caa_dpan;
-
- op_mask_pt_funcs[SP_N][SM_N][SC_N][DP_AS][CPU_C] = _op_mask_pt_cn_dpas;
- op_mask_pt_funcs[SP_N][SM_N][SC][DP_AS][CPU_C] = _op_mask_pt_c_dpas;
- op_mask_pt_funcs[SP_N][SM_N][SC_AN][DP_AS][CPU_C] = _op_mask_pt_can_dpas;
- op_mask_pt_funcs[SP_N][SM_N][SC_AA][DP_AS][CPU_C] = _op_mask_pt_caa_dpas;
}
#endif
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
