From: Laurent Vivier <laurent@vivier.eu>
To: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>, qemu-devel@nongnu.org
Subject: Re: [PATCH 09/12] macfb: fix up 1-bit pixel encoding
Date: Mon, 4 Oct 2021 16:40:21 +0200 [thread overview]
Message-ID: <a74b7a69-a9ef-9813-c75c-a74eee1a0099@vivier.eu> (raw)
In-Reply-To: <20211002110007.30825-10-mark.cave-ayland@ilande.co.uk>
On 02/10/2021 13:00, Mark Cave-Ayland wrote:
> 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>
> ---
> 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 6a69334565..0c9e181b9b 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);
>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
next prev parent reply other threads:[~2021-10-04 14:44 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-02 10:59 [PATCH 00/12] macfb: fixes for booting MacOS Mark Cave-Ayland
2021-10-02 10:59 ` [PATCH 01/12] macfb: handle errors that occur during realize Mark Cave-Ayland
2021-10-02 11:36 ` BALATON Zoltan
2021-10-04 18:38 ` Mark Cave-Ayland
2021-10-02 13:47 ` Philippe Mathieu-Daudé
2021-10-04 18:39 ` Mark Cave-Ayland
2021-10-04 8:47 ` Laurent Vivier
2021-10-02 10:59 ` [PATCH 02/12] macfb: fix invalid object reference in macfb_common_realize() Mark Cave-Ayland
2021-10-02 11:38 ` BALATON Zoltan
2021-10-02 13:51 ` Philippe Mathieu-Daudé
2021-10-04 8:49 ` Laurent Vivier
2021-10-02 10:59 ` [PATCH 03/12] macfb: fix overflow of color_palette array Mark Cave-Ayland
2021-10-04 8:53 ` Laurent Vivier
2021-10-04 18:48 ` Mark Cave-Ayland
2021-10-02 10:59 ` [PATCH 04/12] macfb: use memory_region_init_ram() in macfb_common_realize() for the framebuffer Mark Cave-Ayland
2021-10-02 11:42 ` BALATON Zoltan
2021-10-02 13:59 ` Philippe Mathieu-Daudé
2021-10-04 8:53 ` Laurent Vivier
2021-10-02 11:00 ` [PATCH 05/12] macfb: add trace events for reading and writing the control registers Mark Cave-Ayland
2021-10-02 14:00 ` Philippe Mathieu-Daudé
2021-10-04 8:57 ` Laurent Vivier
2021-10-02 11:00 ` [PATCH 06/12] macfb: implement mode sense to allow display type to be detected Mark Cave-Ayland
2021-10-04 9:20 ` Laurent Vivier
2021-10-04 10:32 ` BALATON Zoltan
2021-10-04 10:50 ` Laurent Vivier
2021-10-02 11:00 ` [PATCH 07/12] macfb: add qdev property to specify display type Mark Cave-Ayland
2021-10-02 14:04 ` Philippe Mathieu-Daudé
2021-10-04 18:46 ` Mark Cave-Ayland
2021-10-04 9:24 ` Laurent Vivier
2021-10-04 14:38 ` Laurent Vivier
2021-10-02 11:00 ` [PATCH 08/12] macfb: add common monitor modes supported by the MacOS toolbox ROM Mark Cave-Ayland
2021-10-04 14:39 ` Laurent Vivier
2021-10-02 11:00 ` [PATCH 09/12] macfb: fix up 1-bit pixel encoding Mark Cave-Ayland
2021-10-04 14:40 ` Laurent Vivier [this message]
2021-10-02 11:00 ` [PATCH 10/12] macfb: fix 24-bit RGB " Mark Cave-Ayland
2021-10-04 14:41 ` Laurent Vivier
2021-10-02 11:00 ` [PATCH 11/12] macfb: add vertical blank interrupt Mark Cave-Ayland
2021-10-04 16:32 ` Laurent Vivier
2021-10-04 18:52 ` Mark Cave-Ayland
2021-10-02 11:00 ` [PATCH 12/12] q800: wire macfb IRQ to separate video interrupt on VIA2 Mark Cave-Ayland
2021-10-02 14:06 ` Philippe Mathieu-Daudé
2021-10-04 9:28 ` Laurent Vivier
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=a74b7a69-a9ef-9813-c75c-a74eee1a0099@vivier.eu \
--to=laurent@vivier.eu \
--cc=mark.cave-ayland@ilande.co.uk \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).