Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/evas
Dir : e17/libs/evas/src/lib/engines/common/evas_op_blend
Modified Files:
op_blend_color_.c op_blend_color_i386.c op_blend_mask_color_.c
op_blend_mask_color_i386.c op_blend_pixel_.c
op_blend_pixel_color_.c op_blend_pixel_color_i386.c
op_blend_pixel_i386.c op_blend_pixel_mask_.c
op_blend_pixel_mask_i386.c
Log Message:
same as previous commit.
===================================================================
RCS file:
/cvs/e/e17/libs/evas/src/lib/engines/common/evas_op_blend/op_blend_color_.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- op_blend_color_.c 2 May 2006 07:28:47 -0000 1.1
+++ op_blend_color_.c 30 Sep 2006 10:18:32 -0000 1.2
@@ -4,29 +4,16 @@
#ifdef BUILD_C
static void
_op_blend_c_dp(DATA32 *s, DATA8 *m, DATA32 c, DATA32 *d, int l) {
- DATA32 *e = d + l, ca = 1 + (c >> 24);
+ DATA32 *e = d + l, a = 256 - (c >> 24);
while (d < e)
- {
- DATA32 da = *d >> 24;
- da = 1 + _evas_pow_lut[((ca - 1) << 8) + da];
- *d++ = BLEND_ARGB_256(ca, da, c, *d);
- }
-}
-
-static void
-_op_blend_c_dpan(DATA32 *s, DATA8 *m, DATA32 c, DATA32 *d, int l) {
- DATA32 *e = d + l, ca = 1 + (c >> 24);
- while (d < e)
- *d++ = BLEND_RGB_256(ca, c, *d);
+ *d++ = c + MUL_256(a, *d);
}
#define _op_blend_caa_dp _op_blend_c_dp
+#define _op_blend_c_dpan _op_blend_c_dp
#define _op_blend_caa_dpan _op_blend_c_dpan
-#define _op_blend_c_dpas _op_blend_c_dp
-#define _op_blend_caa_dpas _op_blend_c_dp
-
static void
init_blend_color_span_funcs_c(void)
{
@@ -35,27 +22,19 @@
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;
-
- op_blend_span_funcs[SP_N][SM_N][SC][DP_AS][CPU_C] = _op_blend_c_dpas;
- op_blend_span_funcs[SP_N][SM_N][SC_AA][DP_AS][CPU_C] = _op_blend_caa_dpas;
}
#endif
#ifdef BUILD_C
static void
_op_blend_pt_c_dp(DATA32 s, DATA8 m, DATA32 c, DATA32 *d) {
- DATA32 da = *d >> 24;
- da = 1 + _evas_pow_lut[((c >> 16) & 0xff00) + da];
- *d = BLEND_ARGB_256(1 + (c >> 24), da, c, *d);
-}
-
-static void
-_op_blend_pt_c_dpan(DATA32 s, DATA8 m, DATA32 c, DATA32 *d) {
- *d = BLEND_RGB_256(1 + (c >> 24), c, *d);
+ s = 256 - (c >> 24);
+ *d = c + MUL_256(s, *d);
}
#define _op_blend_pt_caa_dp _op_blend_pt_c_dp
+#define _op_blend_pt_c_dpan _op_blend_pt_c_dp
#define _op_blend_pt_caa_dpan _op_blend_pt_c_dpan
#define _op_blend_pt_c_dpas _op_blend_pt_c_dp
@@ -69,9 +48,6 @@
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;
-
- op_blend_pt_funcs[SP_N][SM_N][SC][DP_AS][CPU_C] = _op_blend_pt_c_dpas;
- op_blend_pt_funcs[SP_N][SM_N][SC_AA][DP_AS][CPU_C] = _op_blend_pt_caa_dpas;
}
#endif
@@ -80,15 +56,19 @@
/* blend_rel color -> dst */
#ifdef BUILD_C
-#define _op_blend_rel_c_dp _op_blend_c_dpan
-#define _op_blend_rel_caa_dp _op_blend_caa_dpan
+static void
+_op_blend_rel_c_dp(DATA32 *s, DATA8 *m, DATA32 c, DATA32 *d, int l) {
+ DATA32 *e = d + l;
+ l = 256 - (c >> 24);
+ while (d < e)
+ *d++ = MUL_SYM(*d >> 24, c) + MUL_256(l, *d);
+}
+
+#define _op_blend_rel_caa_dp _op_blend_rel_c_dp
#define _op_blend_rel_c_dpan _op_blend_c_dpan
#define _op_blend_rel_caa_dpan _op_blend_caa_dpan
-#define _op_blend_rel_c_dpas _op_blend_rel_c_dp
-#define _op_blend_rel_caa_dpas _op_blend_rel_caa_dp
-
static void
init_blend_rel_color_span_funcs_c(void)
{
@@ -97,22 +77,21 @@
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;
-
- op_blend_rel_span_funcs[SP_N][SM_N][SC][DP_AS][CPU_C] =
_op_blend_rel_c_dpas;
- op_blend_rel_span_funcs[SP_N][SM_N][SC_AA][DP_AS][CPU_C] =
_op_blend_rel_caa_dpas;
}
#endif
#ifdef BUILD_C
-#define _op_blend_rel_pt_c_dp _op_blend_pt_c_dpan
-#define _op_blend_rel_pt_caa_dp _op_blend_pt_caa_dpan
+static void
+_op_blend_rel_pt_c_dp(DATA32 s, DATA8 m, DATA32 c, DATA32 *d) {
+ s = *d >> 24;
+ *d = MUL_SYM(s, c) + MUL_256(256 - (c >> 24), *d);
+}
+
+#define _op_blend_rel_pt_caa_dp _op_blend_rel_pt_c_dp
#define _op_blend_rel_pt_c_dpan _op_blend_pt_c_dpan
#define _op_blend_rel_pt_caa_dpan _op_blend_pt_caa_dpan
-#define _op_blend_rel_pt_c_dpas _op_blend_rel_pt_c_dp
-#define _op_blend_rel_pt_caa_dpas _op_blend_rel_pt_caa_dp
-
static void
init_blend_rel_color_pt_funcs_c(void)
{
@@ -121,8 +100,5 @@
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;
-
- op_blend_rel_pt_funcs[SP_N][SM_N][SC][DP_AS][CPU_C] =
_op_blend_rel_pt_c_dpas;
- op_blend_rel_pt_funcs[SP_N][SM_N][SC_AA][DP_AS][CPU_C] =
_op_blend_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
