[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v4 10/13] macfb: fix up 1-bit pixel encoding
From: |
Mark Cave-Ayland |
Subject: |
[PATCH v4 10/13] macfb: fix up 1-bit pixel encoding |
Date: |
Thu, 7 Oct 2021 23:12:50 +0100 |
The MacOS driver expects the RGB values for the pixel to be in entries 0 and 1
of the colour palette.
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
---
hw/display/macfb.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/hw/display/macfb.c b/hw/display/macfb.c
index 2759fb5e34..e49c8b6f4b 100644
--- a/hw/display/macfb.c
+++ b/hw/display/macfb.c
@@ -128,7 +128,9 @@ static void macfb_draw_line1(MacfbState *s, uint8_t *d,
uint32_t addr,
for (x = 0; x < width; x++) {
int bit = x & 7;
int idx = (macfb_read_byte(s, addr) >> (7 - bit)) & 1;
- r = g = b = ((1 - idx) << 7);
+ r = s->color_palette[idx * 3];
+ g = s->color_palette[idx * 3 + 1];
+ b = s->color_palette[idx * 3 + 2];
addr += (bit == 7);
*(uint32_t *)d = rgb_to_pixel32(r, g, b);
--
2.20.1
- [PATCH v4 00/13] macfb: fixes for booting MacOS, Mark Cave-Ayland, 2021/10/07
- [PATCH v4 01/13] macfb: handle errors that occur during realize, Mark Cave-Ayland, 2021/10/07
- [PATCH v4 02/13] macfb: update macfb.c to use the Error API best practices, Mark Cave-Ayland, 2021/10/07
- [PATCH v4 03/13] macfb: fix invalid object reference in macfb_common_realize(), Mark Cave-Ayland, 2021/10/07
- [PATCH v4 04/13] macfb: fix overflow of color_palette array, Mark Cave-Ayland, 2021/10/07
- [PATCH v4 05/13] macfb: use memory_region_init_ram() in macfb_common_realize() for the framebuffer, Mark Cave-Ayland, 2021/10/07
- [PATCH v4 06/13] macfb: add trace events for reading and writing the control registers, Mark Cave-Ayland, 2021/10/07
- [PATCH v4 09/13] macfb: add common monitor modes supported by the MacOS toolbox ROM, Mark Cave-Ayland, 2021/10/07
- [PATCH v4 07/13] macfb: implement mode sense to allow display type to be detected, Mark Cave-Ayland, 2021/10/07
- [PATCH v4 08/13] macfb: add qdev property to specify display type, Mark Cave-Ayland, 2021/10/07
- [PATCH v4 10/13] macfb: fix up 1-bit pixel encoding,
Mark Cave-Ayland <=
- [PATCH v4 11/13] macfb: fix 24-bit RGB pixel encoding, Mark Cave-Ayland, 2021/10/07
- [PATCH v4 12/13] macfb: add vertical blank interrupt, Mark Cave-Ayland, 2021/10/07
- [PATCH v4 13/13] q800: wire macfb IRQ to separate video interrupt on VIA2, Mark Cave-Ayland, 2021/10/07
- Re: [PATCH v4 00/13] macfb: fixes for booting MacOS, Laurent Vivier, 2021/10/08