Revert "render: don’t assume PIXMAN_a8r8g8b8 for color glyphs"

This reverts commit 9b4796e996.

Sub-pixel anti-aliasing also uses 32-bit glyphs (but x8r8g8b8, instead
of a8r8g8b8)...
This commit is contained in:
Daniel Eklöf 2021-07-14 19:55:23 +02:00
parent 654e65631d
commit 0c777d825d
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F

View file

@ -682,7 +682,7 @@ render_cell(struct terminal *term, pixman_image_t *pix,
if (i > 0 && glyph->x >= 0)
g_x -= term->cell_width;
if (unlikely(PIXMAN_FORMAT_BPP(pixman_image_get_format(glyph->pix)) == 32)) {
if (unlikely(pixman_image_get_format(glyph->pix) == PIXMAN_a8r8g8b8)) {
/* Glyph surface is a pre-rendered image (typically a color emoji...) */
if (!(cell->attrs.blink && term->blink.state == BLINK_OFF)) {
pixman_image_composite32(
@ -2801,7 +2801,7 @@ render_search_box(struct terminal *term)
continue;
}
if (unlikely(PIXMAN_FORMAT_BPP(pixman_image_get_format(glyph->pix)) == 32)) {
if (unlikely(pixman_image_get_format(glyph->pix) == PIXMAN_a8r8g8b8)) {
/* Glyph surface is a pre-rendered image (typically a color emoji...) */
pixman_image_composite32(
PIXMAN_OP_OVER, glyph->pix, NULL, buf->pix[0], 0, 0, 0, 0,