djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix Pallete cache for grayscale and tricolor epd

Browse Source
This commit is contained in:
Scott Shawcroft 2023-03-22 11:54:43 -07:00
parent a280c010c2
commit 16c8dad078
No known key found for this signature in database
GPG Key ID: 0DFD512649C052DA
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
shared-module/displayio/Palette.c
View File

@ -81,7 +81,13 @@ void displayio_palette_get_color(displayio_palette_t *self, const _displayio_col
}
// Cache results when not dithering.
if (!self->dither && self->colors[palette_index].cached_colorspace == colorspace) {
_displayio_color_t *color = &self->colors[palette_index];
// Check the grayscale settings because EPaperDisplay will change them on
// the same object.
if (!self->dither &&
color->cached_colorspace == colorspace &&
color->cached_colorspace_grayscale_bit == colorspace->grayscale_bit &&
color->cached_colorspace_grayscale == colorspace->grayscale) {
output_color->pixel = self->colors[palette_index].cached_color;
return;
}
@ -90,8 +96,10 @@ void displayio_palette_get_color(displayio_palette_t *self, const _displayio_col
rgb888_pixel.pixel = self->colors[palette_index].rgb888;
displayio_convert_color(colorspace, self->dither, &rgb888_pixel, output_color);
if (!self->dither) {
self->colors[palette_index].cached_colorspace = colorspace;
self->colors[palette_index].cached_color = output_color->pixel;
color->cached_colorspace = colorspace;
color->cached_color = output_color->pixel;
color->cached_colorspace_grayscale = colorspace->grayscale;
color->cached_colorspace_grayscale_bit = colorspace->grayscale_bit;
}
}

2
shared-module/displayio/Palette.h
View File

@ -51,6 +51,8 @@ typedef struct {
uint32_t rgb888;
const _displayio_colorspace_t *cached_colorspace;
uint32_t cached_color;
uint8_t cached_colorspace_grayscale_bit;
bool cached_colorspace_grayscale;
bool transparent; // This may have additional bits added later for blending.
} _displayio_color_t;