Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/evas
Dir : e17/libs/evas/src/lib/engines/common/evas_op_copy
Modified Files:
op_copy_color_.c op_copy_color_i386.c op_copy_mask_color_.c
op_copy_mask_color_i386.c op_copy_pixel_.c
op_copy_pixel_color_.c op_copy_pixel_color_i386.c
op_copy_pixel_i386.c op_copy_pixel_mask_.c
op_copy_pixel_mask_i386.c
Log Message:
same as previous commit.
===================================================================
RCS file:
/cvs/e/e17/libs/evas/src/lib/engines/common/evas_op_copy/op_copy_color_.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- op_copy_color_.c 2 May 2006 07:28:47 -0000 1.1
+++ op_copy_color_.c 30 Sep 2006 10:18:33 -0000 1.2
@@ -19,11 +19,6 @@
#define _op_copy_can_dpan _op_copy_c_dp
#define _op_copy_caa_dpan _op_copy_c_dp
-#define _op_copy_c_dpas _op_copy_c_dp
-#define _op_copy_cn_dpas _op_copy_c_dp
-#define _op_copy_can_dpas _op_copy_c_dp
-#define _op_copy_caa_dpas _op_copy_c_dp
-
static void
init_copy_color_span_funcs_c(void)
{
@@ -36,11 +31,6 @@
op_copy_span_funcs[SP_N][SM_N][SC][DP_AN][CPU_C] = _op_copy_c_dpan;
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;
-
- op_copy_span_funcs[SP_N][SM_N][SC_N][DP_AS][CPU_C] = _op_copy_cn_dpas;
- op_copy_span_funcs[SP_N][SM_N][SC][DP_AS][CPU_C] = _op_copy_c_dpas;
- op_copy_span_funcs[SP_N][SM_N][SC_AN][DP_AS][CPU_C] = _op_copy_can_dpas;
- op_copy_span_funcs[SP_N][SM_N][SC_AA][DP_AS][CPU_C] = _op_copy_caa_dpas;
}
#endif
@@ -59,11 +49,6 @@
#define _op_copy_pt_can_dpan _op_copy_pt_c_dp
#define _op_copy_pt_caa_dpan _op_copy_pt_c_dp
-#define _op_copy_pt_c_dpas _op_copy_pt_c_dp
-#define _op_copy_pt_cn_dpas _op_copy_pt_c_dp
-#define _op_copy_pt_can_dpas _op_copy_pt_c_dp
-#define _op_copy_pt_caa_dpas _op_copy_pt_c_dp
-
static void
init_copy_color_pt_funcs_c(void)
{
@@ -76,11 +61,6 @@
op_copy_pt_funcs[SP_N][SM_N][SC][DP_AN][CPU_C] = _op_copy_pt_c_dpan;
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;
-
- op_copy_pt_funcs[SP_N][SM_N][SC_N][DP_AS][CPU_C] = _op_copy_pt_cn_dpas;
- op_copy_pt_funcs[SP_N][SM_N][SC][DP_AS][CPU_C] = _op_copy_pt_c_dpas;
- op_copy_pt_funcs[SP_N][SM_N][SC_AN][DP_AS][CPU_C] = _op_copy_pt_can_dpas;
- op_copy_pt_funcs[SP_N][SM_N][SC_AA][DP_AS][CPU_C] = _op_copy_pt_caa_dpas;
}
#endif
@@ -91,31 +71,15 @@
#ifdef BUILD_C
static void
_op_copy_rel_c_dp(DATA32 *s, DATA8 *m, DATA32 c, DATA32 *d, int l) {
- DATA32 *e = d + l, ca = 1 + (c >> 24);
- c &= 0x00ffffff;
- for (; d < e; d++) {
- *d = MUL_A_256(ca, *d) + c;
- }
-}
-
-static void
-_op_copy_rel_cn_dp(DATA32 *s, DATA8 *m, DATA32 c, DATA32 *d, int l) {
DATA32 *e = d + l;
for (; d < e; d++) {
- *d = (*d | 0x00ffffff);
- }
-}
-
-static void
-_op_copy_rel_can_dp(DATA32 *s, DATA8 *m, DATA32 c, DATA32 *d, int l) {
- DATA32 *e = d + l;
- c &= 0x00ffffff;
- for (; d < e; d++) {
- *d = (*d & 0xff000000) + c;
+ *d = MUL_SYM(*d >> 24, c);
}
}
+#define _op_copy_rel_cn_dp _op_copy_rel_c_dp
+#define _op_copy_rel_can_dp _op_copy_rel_c_dp
#define _op_copy_rel_caa_dp _op_copy_rel_c_dp
#define _op_copy_rel_c_dpan _op_copy_c_dp
@@ -123,11 +87,6 @@
#define _op_copy_rel_can_dpan _op_copy_can_dp
#define _op_copy_rel_caa_dpan _op_copy_caa_dp
-#define _op_copy_rel_c_dpas _op_copy_rel_c_dp
-#define _op_copy_rel_cn_dpas _op_copy_rel_cn_dp
-#define _op_copy_rel_can_dpas _op_copy_rel_can_dp
-#define _op_copy_rel_caa_dpas _op_copy_rel_caa_dp
-
static void
init_copy_rel_color_span_funcs_c(void)
{
@@ -140,31 +99,19 @@
op_copy_rel_span_funcs[SP_N][SM_N][SC][DP_AN][CPU_C] = _op_copy_rel_c_dpan;
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;
-
- op_copy_rel_span_funcs[SP_N][SM_N][SC_N][DP_AS][CPU_C] =
_op_copy_rel_cn_dpas;
- op_copy_rel_span_funcs[SP_N][SM_N][SC][DP_AS][CPU_C] = _op_copy_rel_c_dpas;
- op_copy_rel_span_funcs[SP_N][SM_N][SC_AN][DP_AS][CPU_C] =
_op_copy_rel_can_dpas;
- op_copy_rel_span_funcs[SP_N][SM_N][SC_AA][DP_AS][CPU_C] =
_op_copy_rel_caa_dpas;
}
#endif
#ifdef BUILD_C
static void
_op_copy_rel_pt_c_dp(DATA32 s, DATA8 m, DATA32 c, DATA32 *d) {
- *d = MUL_A_SYM(c, *d) + (c & 0x00ffffff);
-}
-
-static void
-_op_copy_rel_pt_cn_dp(DATA32 s, DATA8 m, DATA32 c, DATA32 *d) {
- *d = (*d | 0x00ffffff);
-}
-
-static void
-_op_copy_rel_pt_can_dp(DATA32 s, DATA8 m, DATA32 c, DATA32 *d) {
- *d = (*d & 0xff000000) + (c & 0x00ffffff);
+ s = 1 + (*d >> 24);
+ *d = MUL_256(s, c);
}
+#define _op_copy_rel_pt_cn_dp _op_copy_rel_pt_c_dp
+#define _op_copy_rel_pt_can_dp _op_copy_rel_pt_c_dp
#define _op_copy_rel_pt_caa_dp _op_copy_rel_pt_c_dp
#define _op_copy_rel_pt_c_dpan _op_copy_pt_c_dp
@@ -172,11 +119,6 @@
#define _op_copy_rel_pt_can_dpan _op_copy_pt_can_dp
#define _op_copy_rel_pt_caa_dpan _op_copy_pt_caa_dp
-#define _op_copy_rel_pt_c_dpas _op_copy_rel_pt_c_dp
-#define _op_copy_rel_pt_cn_dpas _op_copy_rel_pt_cn_dp
-#define _op_copy_rel_pt_can_dpas _op_copy_rel_pt_can_dp
-#define _op_copy_rel_pt_caa_dpas _op_copy_rel_pt_caa_dp
-
static void
init_copy_rel_color_pt_funcs_c(void)
{
@@ -189,10 +131,5 @@
op_copy_rel_pt_funcs[SP_N][SM_N][SC][DP_AN][CPU_C] = _op_copy_rel_pt_c_dpan;
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;
-
- op_copy_rel_pt_funcs[SP_N][SM_N][SC_N][DP_AS][CPU_C] =
_op_copy_rel_pt_cn_dpas;
- op_copy_rel_pt_funcs[SP_N][SM_N][SC][DP_AS][CPU_C] = _op_copy_rel_pt_c_dpas;
- op_copy_rel_pt_funcs[SP_N][SM_N][SC_AN][DP_AS][CPU_C] =
_op_copy_rel_pt_can_dpas;
- op_copy_rel_pt_funcs[SP_N][SM_N][SC_AA][DP_AS][CPU_C] =
_op_copy_rel_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
