Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/evas
Dir : e17/libs/evas/src/lib/engines/common
Modified Files:
evas_blend_alpha_color_pixel.c evas_blend_color_pixel.c
evas_blend_pixel_cmod_pixel.c evas_blend_pixel_mul_pixel.c
evas_blend_pixel_pixel.c
Log Message:
fix shaped output (rgba dest rendering)
===================================================================
RCS file:
/cvsroot/enlightenment/e17/libs/evas/src/lib/engines/common/evas_blend_alpha_color_pixel.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- evas_blend_alpha_color_pixel.c 3 Feb 2005 07:28:06 -0000 1.8
+++ evas_blend_alpha_color_pixel.c 11 Feb 2005 05:33:44 -0000 1.9
@@ -159,20 +159,21 @@
*dst_ptr = col;
break;
default:
+ BLEND_ADST_ALPHA_SETUP(aa, tmp);
a = _evas_pow_lut[(aa << 8) | A_VAL(dst_ptr)];
- BLEND_COLOR(aa, A_VAL(dst_ptr),
- 255, A_VAL(dst_ptr),
- tmp);
- BLEND_ALPHA_SETUP(a, tmp);
- BLEND_COLOR(a, R_VAL(dst_ptr),
- R_VAL(&col), R_VAL(dst_ptr),
- tmp);
- BLEND_COLOR(a, G_VAL(dst_ptr),
- G_VAL(&col), G_VAL(dst_ptr),
- tmp);
- BLEND_COLOR(a, B_VAL(dst_ptr),
- B_VAL(&col), B_VAL(dst_ptr),
- tmp);
+ BLEND_ADST_COLOR(aa, A_VAL(dst_ptr),
+ 255, A_VAL(dst_ptr),
+ tmp);
+ BLEND_ADST_ALPHA_SETUP(a, tmp);
+ BLEND_ADST_COLOR(a, R_VAL(dst_ptr),
+ R_VAL(&col), R_VAL(dst_ptr),
+ tmp);
+ BLEND_ADST_COLOR(a, G_VAL(dst_ptr),
+ G_VAL(&col), G_VAL(dst_ptr),
+ tmp);
+ BLEND_ADST_COLOR(a, B_VAL(dst_ptr),
+ B_VAL(&col), B_VAL(dst_ptr),
+ tmp);
break;
}
src_ptr++;
===================================================================
RCS file:
/cvsroot/enlightenment/e17/libs/evas/src/lib/engines/common/evas_blend_color_pixel.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- evas_blend_color_pixel.c 3 Feb 2005 07:28:06 -0000 1.8
+++ evas_blend_color_pixel.c 11 Feb 2005 05:33:44 -0000 1.9
@@ -95,21 +95,21 @@
DATA32 tmp;
DATA8 a;
+ BLEND_ADST_ALPHA_SETUP(A_VAL(&src), tmp);
a = _evas_pow_lut[(A_VAL(&src) << 8) | A_VAL(dst_ptr)];
-
- BLEND_COLOR(A_VAL(&src), A_VAL(dst_ptr),
- 255, A_VAL(dst_ptr),
- tmp);
- BLEND_ALPHA_SETUP(a, tmp);
- BLEND_COLOR(a, R_VAL(dst_ptr),
- R_VAL(&src), R_VAL(dst_ptr),
- tmp);
- BLEND_COLOR(a, G_VAL(dst_ptr),
- G_VAL(&src), G_VAL(dst_ptr),
- tmp);
- BLEND_COLOR(a, B_VAL(dst_ptr),
- B_VAL(&src), B_VAL(dst_ptr),
- tmp);
+ BLEND_ADST_COLOR(A_VAL(&src), A_VAL(dst_ptr),
+ 255, A_VAL(dst_ptr),
+ tmp);
+ BLEND_ADST_ALPHA_SETUP(a, tmp);
+ BLEND_ADST_COLOR(a, R_VAL(dst_ptr),
+ R_VAL(&src), R_VAL(dst_ptr),
+ tmp);
+ BLEND_ADST_COLOR(a, G_VAL(dst_ptr),
+ G_VAL(&src), G_VAL(dst_ptr),
+ tmp);
+ BLEND_ADST_COLOR(a, B_VAL(dst_ptr),
+ B_VAL(&src), B_VAL(dst_ptr),
+ tmp);
dst_ptr++;
}
===================================================================
RCS file:
/cvsroot/enlightenment/e17/libs/evas/src/lib/engines/common/evas_blend_pixel_cmod_pixel.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- evas_blend_pixel_cmod_pixel.c 3 Feb 2005 07:28:06 -0000 1.7
+++ evas_blend_pixel_cmod_pixel.c 11 Feb 2005 05:33:44 -0000 1.8
@@ -78,19 +78,21 @@
B_VAL(dst_ptr) = bmod[B_VAL(src_ptr)];
break;
default:
+ BLEND_ADST_ALPHA_SETUP(aa, tmp);
a = _evas_pow_lut[(aa << 8) | A_VAL(dst_ptr)];
- BLEND_COLOR(aa,A_VAL(dst_ptr),
- 255,A_VAL(dst_ptr),tmp);
- BLEND_ALPHA_SETUP(a, tmp);
- BLEND_COLOR(a, R_VAL(dst_ptr),
- rmod[R_VAL(src_ptr)], R_VAL(dst_ptr),
- tmp);
- BLEND_COLOR(a, G_VAL(dst_ptr),
- gmod[G_VAL(src_ptr)], G_VAL(dst_ptr),
- tmp);
- BLEND_COLOR(a, B_VAL(dst_ptr),
- bmod[B_VAL(src_ptr)], B_VAL(dst_ptr),
- tmp);
+ BLEND_ADST_COLOR(aa, A_VAL(dst_ptr),
+ 255, A_VAL(dst_ptr),
+ tmp);
+ BLEND_ADST_ALPHA_SETUP(a, tmp);
+ BLEND_ADST_COLOR(a, R_VAL(dst_ptr),
+ rmod[R_VAL(src_ptr)], R_VAL(dst_ptr),
+ tmp);
+ BLEND_ADST_COLOR(a, G_VAL(dst_ptr),
+ gmod[G_VAL(src_ptr)], G_VAL(dst_ptr),
+ tmp);
+ BLEND_ADST_COLOR(a, B_VAL(dst_ptr),
+ bmod[B_VAL(src_ptr)], B_VAL(dst_ptr),
+ tmp);
break;
}
src_ptr++;
===================================================================
RCS file:
/cvsroot/enlightenment/e17/libs/evas/src/lib/engines/common/evas_blend_pixel_mul_pixel.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- evas_blend_pixel_mul_pixel.c 3 Feb 2005 07:28:06 -0000 1.8
+++ evas_blend_pixel_mul_pixel.c 11 Feb 2005 05:33:44 -0000 1.9
@@ -202,21 +202,21 @@
*dst_ptr = *src_ptr;
break;
default:
+ BLEND_ADST_ALPHA_SETUP(aa, tmp);
a = _evas_pow_lut[(aa << 8) | A_VAL(dst_ptr)];
-
- BLEND_COLOR(aa, A_VAL(dst_ptr),
- 255, A_VAL(dst_ptr),
- tmp);
- BLEND_ALPHA_SETUP(a, tmp);
- BLEND_COLOR(a, R_VAL(dst_ptr),
- R_VAL(src_ptr), R_VAL(dst_ptr),
- tmp);
- BLEND_COLOR(a, G_VAL(dst_ptr),
- G_VAL(src_ptr), G_VAL(dst_ptr),
- tmp);
- BLEND_COLOR(a, B_VAL(dst_ptr),
- B_VAL(src_ptr), B_VAL(dst_ptr),
- tmp);
+ BLEND_ADST_COLOR(aa, A_VAL(dst_ptr),
+ 255, A_VAL(dst_ptr),
+ tmp);
+ BLEND_ADST_ALPHA_SETUP(a, tmp);
+ BLEND_ADST_COLOR(a, R_VAL(dst_ptr),
+ R_VAL(src_ptr), R_VAL(dst_ptr),
+ tmp);
+ BLEND_ADST_COLOR(a, G_VAL(dst_ptr),
+ G_VAL(src_ptr), G_VAL(dst_ptr),
+ tmp);
+ BLEND_ADST_COLOR(a, B_VAL(dst_ptr),
+ B_VAL(src_ptr), B_VAL(dst_ptr),
+ tmp);
break;
}
src_ptr++;
@@ -242,21 +242,21 @@
B_VAL(dst_ptr) = ((B_VAL(src_ptr) * (B_VAL(&mul_color) + 1))
>> 8);
break;
default:
+ BLEND_ADST_ALPHA_SETUP(aa, tmp);
a = _evas_pow_lut[(aa << 8) | A_VAL(dst_ptr)];
-
- BLEND_COLOR(aa, A_VAL(dst_ptr),
- 255, A_VAL(dst_ptr),
- tmp);
- BLEND_ALPHA_SETUP(a, tmp);
- BLEND_COLOR(a, R_VAL(dst_ptr),
- ((R_VAL(src_ptr) * (R_VAL(&mul_color) + 1)) >>
8), R_VAL(dst_ptr),
- tmp);
- BLEND_COLOR(a, G_VAL(dst_ptr),
- ((G_VAL(src_ptr) * (G_VAL(&mul_color) + 1)) >>
8), G_VAL(dst_ptr),
- tmp);
- BLEND_COLOR(a, B_VAL(dst_ptr),
- ((B_VAL(src_ptr) * (B_VAL(&mul_color) + 1)) >>
8), B_VAL(dst_ptr),
- tmp);
+ BLEND_ADST_COLOR(aa, A_VAL(dst_ptr),
+ 255, A_VAL(dst_ptr),
+ tmp);
+ BLEND_ADST_ALPHA_SETUP(a, tmp);
+ BLEND_ADST_COLOR(a, R_VAL(dst_ptr),
+ ((R_VAL(src_ptr) * (R_VAL(&mul_color) + 1))
>> 8), R_VAL(dst_ptr),
+ tmp);
+ BLEND_ADST_COLOR(a, G_VAL(dst_ptr),
+ ((G_VAL(src_ptr) * (G_VAL(&mul_color) + 1))
>> 8), G_VAL(dst_ptr),
+ tmp);
+ BLEND_ADST_COLOR(a, B_VAL(dst_ptr),
+ ((B_VAL(src_ptr) * (B_VAL(&mul_color) + 1))
>> 8), B_VAL(dst_ptr),
+ tmp);
break;
}
src_ptr++;
===================================================================
RCS file:
/cvsroot/enlightenment/e17/libs/evas/src/lib/engines/common/evas_blend_pixel_pixel.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- evas_blend_pixel_pixel.c 3 Feb 2005 07:28:06 -0000 1.14
+++ evas_blend_pixel_pixel.c 11 Feb 2005 05:33:44 -0000 1.15
@@ -128,21 +128,21 @@
*dst_ptr = *src_ptr;
break;
default:
+ BLEND_ADST_ALPHA_SETUP(aa, tmp);
a = _evas_pow_lut[(aa << 8) | A_VAL(dst_ptr)];
-
- BLEND_COLOR(aa, A_VAL(dst_ptr),
- 255, A_VAL(dst_ptr),
- tmp);
- BLEND_ALPHA_SETUP(a, tmp);
- BLEND_COLOR(a, R_VAL(dst_ptr),
- R_VAL(src_ptr), R_VAL(dst_ptr),
- tmp);
- BLEND_COLOR(a, G_VAL(dst_ptr),
- G_VAL(src_ptr), G_VAL(dst_ptr),
- tmp);
- BLEND_COLOR(a, B_VAL(dst_ptr),
- B_VAL(src_ptr), B_VAL(dst_ptr),
- tmp);
+ BLEND_ADST_COLOR(aa, A_VAL(dst_ptr),
+ 255, A_VAL(dst_ptr),
+ tmp);
+ BLEND_ADST_ALPHA_SETUP(a, tmp);
+ BLEND_ADST_COLOR(a, R_VAL(dst_ptr),
+ R_VAL(src_ptr), R_VAL(dst_ptr),
+ tmp);
+ BLEND_ADST_COLOR(a, G_VAL(dst_ptr),
+ G_VAL(src_ptr), G_VAL(dst_ptr),
+ tmp);
+ BLEND_ADST_COLOR(a, B_VAL(dst_ptr),
+ B_VAL(src_ptr), B_VAL(dst_ptr),
+ tmp);
}
src_ptr++;
dst_ptr++;
-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
