diff options
| author | Rick Tillery <rtillery@ti.com> | 2012-01-10 11:36:22 -0600 |
|---|---|---|
| committer | Rick Tillery <rtillery@ti.com> | 2012-01-10 11:36:22 -0600 |
| commit | cd4f2ff5f50a086202f0e4a7f51a40494026c6a0 (patch) | |
| tree | 962c6784dd2d41e22780e1fdbb051651d1bf920d | |
| parent | 9c236cf5103dbe7180804a7482c72c5107d8ca92 (diff) | |
| download | hardware_ti_omap4-cd4f2ff5f50a086202f0e4a7f51a40494026c6a0.zip hardware_ti_omap4-cd4f2ff5f50a086202f0e4a7f51a40494026c6a0.tar.gz hardware_ti_omap4-cd4f2ff5f50a086202f0e4a7f51a40494026c6a0.tar.bz2 | |
Fixed definition of K mask in bltsville/include/bvblend.h.
Change-Id: I97b292eb80c335a3dc2f702deabdbbcdd23377d4
Signed-off-by: Rick Tillery <rtillery@ti.com>
| -rwxr-xr-x | bltsville/include/bvblend.h | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/bltsville/include/bvblend.h b/bltsville/include/bvblend.h index 3dc9b8f..f187d81 100755 --- a/bltsville/include/bvblend.h +++ b/bltsville/include/bvblend.h @@ -357,15 +357,16 @@ BVBLENDDEF_ONLY_C_NORM_xx | \ BVBLENDDEF_ONLY_C_INV_xx) +#define BVBLENDDEF_K_MASK \ + (BVBLENDDEF_MODE_MASK | \ + BVBLENDDEF_INV_MASK | \ + BVBLENDDEF_NORM_MASK) + #define BVBLENDDEF_K1_SHIFT 18 #define BVBLENDDEF_K2_SHIFT 12 #define BVBLENDDEF_K3_SHIFT 6 #define BVBLENDDEF_K4_SHIFT 0 -#define BVBLENDDEF_K_MASK \ - ((BVBLENDDEF_MODE_MASK << BVBLENDDEF_MODE_SHIFT) | \ - (BVBLENDDEF_INV_MASK << BVBLENDDEF_INV_SHIFT) | \ - (BVBLENDDEF_NORM_MASK << BVBLENDDEF_NORM_SHIFT)) #define BVBLENDDEF_K1_MASK \ (BVBLENDDEF_K_MASK << BVBLENDDEF_K1_SHIFT) #define BVBLENDDEF_K2_MASK \ @@ -400,11 +401,6 @@ union bvalpha { }; -/* - * For FORMAT_ESSENTIAL, the variety of well-known blending functions from - * popular image manipulation programs are specified. - */ - enum bvblend { /* Porter-Duff blending equations */ BVBLEND_CLEAR = BVBLENDDEF_FORMAT_CLASSIC | @@ -473,6 +469,11 @@ enum bvblend { (BVBLENDDEF_ONE << BVBLENDDEF_K3_SHIFT) | (BVBLENDDEF_ONE << BVBLENDDEF_K4_SHIFT), +/* + * For FORMAT_ESSENTIAL, the variety of well-known blending functions from + * popular image manipulation programs are specified. + */ + BVBLEND_NORMAL = BVBLENDDEF_FORMAT_ESSENTIAL + 0, BVBLEND_LIGHTEN = BVBLENDDEF_FORMAT_ESSENTIAL + 1, BVBLEND_DARKEN = BVBLENDDEF_FORMAT_ESSENTIAL + 2, |