arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2025-06-23 08:28:46 +00:00
Code Issues Releases Wiki Activity

feat(core): improve blending of mono8 bitmaps

Browse Source 
[no changelog]
This commit is contained in:
cepetr 2025-04-04 11:53:25 +02:00 committed by cepetr
parent d900eb4c54
commit 622fa05e48
3 changed files with 26 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
core/embed/gfx/bitblt/gfx_bitblt_rgba8888.c
View File

@ -165,14 +165,26 @@ void gfx_rgba8888_blend_mono8(const gfx_bitblt_t* bb) {
uint8_t* src_ptr = (uint8_t*)bb->src_row + bb->src_x; uint8_t* src_ptr = (uint8_t*)bb->src_row + bb->src_x;
uint16_t height = bb->height; uint16_t height = bb->height;
while (height-- > 0) { if (bb->src_alpha == 255) {
for (int x = 0; x < bb->width; x++) { while (height-- > 0) {
uint8_t fg_alpha = src_ptr[x]; for (int x = 0; x < bb->width; x++) {
dst_ptr[x] = gfx_color32_blend_a8( uint8_t fg_alpha = src_ptr[x];
bb->src_fg, gfx_color32_to_color(dst_ptr[x]), fg_alpha); dst_ptr[x] = gfx_color32_blend_a8(
bb->src_fg, gfx_color32_to_color(dst_ptr[x]), fg_alpha);
}
dst_ptr += bb->dst_stride / sizeof(*dst_ptr);
src_ptr += bb->src_stride / sizeof(*src_ptr);
}
} else {
while (height-- > 0) {
for (int x = 0; x < bb->width; x++) {
uint8_t fg_alpha = (src_ptr[x] * bb->src_alpha) / 255;
dst_ptr[x] = gfx_color32_blend_a8(
bb->src_fg, gfx_color32_to_color(dst_ptr[x]), fg_alpha);
}
dst_ptr += bb->dst_stride / sizeof(*dst_ptr);
src_ptr += bb->src_stride / sizeof(*src_ptr);
} }
dst_ptr += bb->dst_stride / sizeof(*dst_ptr);
src_ptr += bb->src_stride / sizeof(*src_ptr);
} }
} }
} }

7
core/embed/gfx/bitblt/stm32/dma2d_bitblt.c
View File

@ -786,6 +786,9 @@ bool dma2d_rgba8888_blend_mono8(const gfx_bitblt_t* bb) {
return false; return false;
} }
uint32_t src_fg =
gfx_color32_replace_a(gfx_color_to_color32(bb->src_fg), bb->src_alpha);
drv->handle.Init.ColorMode = DMA2D_OUTPUT_ARGB8888; drv->handle.Init.ColorMode = DMA2D_OUTPUT_ARGB8888;
drv->handle.Init.Mode = DMA2D_M2M_BLEND; drv->handle.Init.Mode = DMA2D_M2M_BLEND;
drv->handle.Init.OutputOffset = bb->dst_stride / sizeof(uint32_t) - bb->width; drv->handle.Init.OutputOffset = bb->dst_stride / sizeof(uint32_t) - bb->width;
@ -793,8 +796,8 @@ bool dma2d_rgba8888_blend_mono8(const gfx_bitblt_t* bb) {
drv->handle.LayerCfg[1].InputColorMode = DMA2D_INPUT_A8; drv->handle.LayerCfg[1].InputColorMode = DMA2D_INPUT_A8;
drv->handle.LayerCfg[1].InputOffset = bb->src_stride - bb->width; drv->handle.LayerCfg[1].InputOffset = bb->src_stride - bb->width;
drv->handle.LayerCfg[1].AlphaMode = 0; drv->handle.LayerCfg[1].AlphaMode = DMA2D_COMBINE_ALPHA;
drv->handle.LayerCfg[1].InputAlpha = gfx_color_to_color32(bb->src_fg); drv->handle.LayerCfg[1].InputAlpha = src_fg;
HAL_DMA2D_ConfigLayer(&drv->handle, 1); HAL_DMA2D_ConfigLayer(&drv->handle, 1);
drv->handle.LayerCfg[0].InputColorMode = DMA2D_INPUT_ARGB8888; drv->handle.LayerCfg[0].InputColorMode = DMA2D_INPUT_ARGB8888;

2
core/embed/gfx/inc/gfx/gfx_color.h
View File

@ -86,6 +86,8 @@ typedef uint32_t gfx_color32_t;
#define gfx_color32_to_b(c) (((c) & 0x000000FF) >> 0) #define gfx_color32_to_b(c) (((c) & 0x000000FF) >> 0)
// Extracts alpha component from gfx_color32_t // Extracts alpha component from gfx_color32_t
#define gfx_color32_to_a(c) (((c) & 0xFF000000) >> 24) #define gfx_color32_to_a(c) (((c) & 0xFF000000) >> 24)
// Sets alpha component of gfx_color32_t
#define gfx_color32_replace_a(c, a) (((c) & 0x00FFFFFF) | ((a) << 24))
// 4-bit linear interpolation between `fg` and `bg` // 4-bit linear interpolation between `fg` and `bg`
#define a4_lerp(fg, bg, alpha) (((fg) * (alpha) + ((bg) * (15 - (alpha)))) / 15) #define a4_lerp(fg, bg, alpha) (((fg) * (alpha) + ((bg) * (15 - (alpha)))) / 15)