[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 11/13] macfb: fix 24-bit RGB pixel encoding
From: |
Laurent Vivier |
Subject: |
[PULL 11/13] macfb: fix 24-bit RGB pixel encoding |
Date: |
Fri, 8 Oct 2021 13:45:16 +0200 |
From: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
According to Apple Technical Note HW26: "Macintosh Quadra Built-In Video" the
in-built framebuffer encodes each 24-bit pixel into 4 bytes. Adjust the 24-bit
RGB pixel encoding accordingly which agrees with the encoding expected by MacOS
when changing into 24-bit colour mode.
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Message-Id: <20211007221253.29024-12-mark.cave-ayland@ilande.co.uk>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
hw/display/macfb.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/hw/display/macfb.c b/hw/display/macfb.c
index e49c8b6f4b52..3288a71b89a6 100644
--- a/hw/display/macfb.c
+++ b/hw/display/macfb.c
@@ -224,10 +224,10 @@ static void macfb_draw_line24(MacfbState *s, uint8_t *d,
uint32_t addr,
int x;
for (x = 0; x < width; x++) {
- r = macfb_read_byte(s, addr);
- g = macfb_read_byte(s, addr + 1);
- b = macfb_read_byte(s, addr + 2);
- addr += 3;
+ r = macfb_read_byte(s, addr + 1);
+ g = macfb_read_byte(s, addr + 2);
+ b = macfb_read_byte(s, addr + 3);
+ addr += 4;
*(uint32_t *)d = rgb_to_pixel32(r, g, b);
d += 4;
--
2.31.1
- [PULL 00/13] M68k next patches, Laurent Vivier, 2021/10/08
- [PULL 01/13] macfb: handle errors that occur during realize, Laurent Vivier, 2021/10/08
- [PULL 04/13] macfb: fix overflow of color_palette array, Laurent Vivier, 2021/10/08
- [PULL 02/13] macfb: update macfb.c to use the Error API best practices, Laurent Vivier, 2021/10/08
- [PULL 09/13] macfb: add common monitor modes supported by the MacOS toolbox ROM, Laurent Vivier, 2021/10/08
- [PULL 10/13] macfb: fix up 1-bit pixel encoding, Laurent Vivier, 2021/10/08
- [PULL 12/13] macfb: add vertical blank interrupt, Laurent Vivier, 2021/10/08
- [PULL 06/13] macfb: add trace events for reading and writing the control registers, Laurent Vivier, 2021/10/08
- [PULL 11/13] macfb: fix 24-bit RGB pixel encoding,
Laurent Vivier <=
- [PULL 13/13] q800: wire macfb IRQ to separate video interrupt on VIA2, Laurent Vivier, 2021/10/08
- [PULL 05/13] macfb: use memory_region_init_ram() in macfb_common_realize() for the framebuffer, Laurent Vivier, 2021/10/08
- [PULL 08/13] macfb: add qdev property to specify display type, Laurent Vivier, 2021/10/08
- [PULL 03/13] macfb: fix invalid object reference in macfb_common_realize(), Laurent Vivier, 2021/10/08
- [PULL 07/13] macfb: implement mode sense to allow display type to be detected, Laurent Vivier, 2021/10/08
- Re: [PULL 00/13] M68k next patches, Richard Henderson, 2021/10/08