aboutsummaryrefslogtreecommitdiffstats
path: root/src/gdisp/gdisp_colors.h
diff options
context:
space:
mode:
authorinmarket <andrewh@inmarket.com.au>2017-10-02 16:47:18 +1000
committerinmarket <andrewh@inmarket.com.au>2017-10-02 16:47:18 +1000
commitf9be386e52a745d19c880aa035c577bed3eb11c7 (patch)
treecf1e220a134e3be514442d44588b9f91c0326931 /src/gdisp/gdisp_colors.h
parentfdaf636b5f0c7ff5280438f524a07c29a2f7eea6 (diff)
downloaduGFX-f9be386e52a745d19c880aa035c577bed3eb11c7.tar.gz
uGFX-f9be386e52a745d19c880aa035c577bed3eb11c7.tar.bz2
uGFX-f9be386e52a745d19c880aa035c577bed3eb11c7.zip
Add alpha blending support
Diffstat (limited to 'src/gdisp/gdisp_colors.h')
-rw-r--r--src/gdisp/gdisp_colors.h9
1 files changed, 7 insertions, 2 deletions
diff --git a/src/gdisp/gdisp_colors.h b/src/gdisp/gdisp_colors.h
index 5bfcfca2..0973e561 100644
--- a/src/gdisp/gdisp_colors.h
+++ b/src/gdisp/gdisp_colors.h
@@ -330,9 +330,14 @@ typedef uint16_t colorformat;
// Special hack to allow alpha on RGB888
#if GDISP_PIXELFORMAT == GDISP_PIXELFORMAT_RGB888
- #define GFXTRANSPARENT (0xFF000000)
+ #define COLOR_BITS_A 8
+ #define COLOR_SHIFT_A 24
+ #define ALPHA_OF(c) (((c)>>24) ^ 0xFF)
+ #define EXACT_ALPHA_OF(c) ALPHA_OF((c))
#define AHTML2COLOR(h) ((h) ^ 0xFF000000)
- #define ARGB2COLOR(a,r,g,b) ((((COLOR_TYPE)(((a) ^ 0xFF) & 0xFF)) << 24) | RGB2COLOR_R(r) | RGB2COLOR_G(g) | RGB2COLOR_B(b))
+ #define RGB2COLOR_A(a) (((COLOR_TYPE)(((a) ^ 0xFF) & 0xFF)) << 24)
+ #define ARGB2COLOR(a,r,g,b) (RGB2COLOR_A(a) | RGB2COLOR_R(r) | RGB2COLOR_G(g) | RGB2COLOR_B(b))
+ #define GFXTRANSPARENT (0xFF000000)
#endif
//-------------------------