diff options
| author | Marc-André Lureau <marcandre.lureau@redhat.com> | 2023-09-05 16:51:53 +0400 |
|---|---|---|
| committer | Marc-André Lureau <marcandre.lureau@redhat.com> | 2023-11-07 14:04:25 +0400 |
| commit | 699f15fd0c062c5f337584c585223bf7c3a9cd8e (patch) | |
| tree | 8d9a4c370d42532f61142a5ab144fc3b5323ae33 /hw/display/ati_2d.c | |
| parent | 376a0531d4f5ebe3e895986e0b2e1c15a9e4721c (diff) | |
| download | qemu-699f15fd0c062c5f337584c585223bf7c3a9cd8e.zip qemu-699f15fd0c062c5f337584c585223bf7c3a9cd8e.tar.gz qemu-699f15fd0c062c5f337584c585223bf7c3a9cd8e.tar.bz2 | |
hw/display/ati: allow compiling without PIXMAN
Change the "x-pixman" property default value and use the fallback path
when PIXMAN support is disabled.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Acked-by: BALATON Zoltan <balaton@eik.bme.hu>
Diffstat (limited to 'hw/display/ati_2d.c')
| -rw-r--r-- | hw/display/ati_2d.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/hw/display/ati_2d.c b/hw/display/ati_2d.c index 0e6b8e4..309bb5c 100644 --- a/hw/display/ati_2d.c +++ b/hw/display/ati_2d.c @@ -123,6 +123,7 @@ void ati_2d_blt(ATIVGAState *s) src_bits, dst_bits, src_stride, dst_stride, bpp, bpp, src_x, src_y, dst_x, dst_y, s->regs.dst_width, s->regs.dst_height); +#ifdef CONFIG_PIXMAN if ((s->use_pixman & BIT(1)) && s->regs.dp_cntl & DST_X_LEFT_TO_RIGHT && s->regs.dp_cntl & DST_Y_TOP_TO_BOTTOM) { @@ -147,7 +148,9 @@ void ati_2d_blt(ATIVGAState *s) s->regs.dst_width, s->regs.dst_height); } g_free(tmp); - } else { + } else +#endif + { fallback = true; } if (fallback) { @@ -206,9 +209,12 @@ void ati_2d_blt(ATIVGAState *s) DPRINTF("pixman_fill(%p, %d, %d, %d, %d, %d, %d, %x)\n", dst_bits, dst_stride, bpp, dst_x, dst_y, s->regs.dst_width, s->regs.dst_height, filler); +#ifdef CONFIG_PIXMAN if (!(s->use_pixman & BIT(0)) || !pixman_fill((uint32_t *)dst_bits, dst_stride, bpp, dst_x, dst_y, - s->regs.dst_width, s->regs.dst_height, filler)) { + s->regs.dst_width, s->regs.dst_height, filler)) +#endif + { /* fallback when pixman failed or we don't want to call it */ unsigned int x, y, i, bypp = bpp / 8; unsigned int dst_pitch = dst_stride * sizeof(uint32_t); |