From 9059ffa6dd57c0304fbb4fda1dfb19ae96feac56 Mon Sep 17 00:00:00 2001 From: TC1995 Date: Fri, 26 Jun 2020 14:29:46 +0200 Subject: [PATCH 1/2] Fixed compile failure. --- src/video/vid_s3.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/video/vid_s3.c b/src/video/vid_s3.c index b2d8d1748..a86a20584 100644 --- a/src/video/vid_s3.c +++ b/src/video/vid_s3.c @@ -660,7 +660,7 @@ static void s3_accel_out_fifo(s3_t *s3, uint16_t port, uint8_t val) s3->accel.pix_trans[1] = val; /*Check to see if there's actual data from CPU*/ if ((s3->accel.multifunc[0xa] & 0xc0) == 0x80 && (s3->accel.cmd & 0x600) == 0x200 && (s3->accel.cmd & 0x100) && - && (((s3->accel.frgd_mix & 0x60) != 0x40) || ((s3->accel.bkgd_mix & 0x60) != 0x40))) + (((s3->accel.frgd_mix & 0x60) != 0x40) || ((s3->accel.bkgd_mix & 0x60) != 0x40))) { if (s3->accel.cmd & 0x1000) s3_accel_start(16, 1, s3->accel.pix_trans[1] | (s3->accel.pix_trans[0] << 8), 0, s3); else s3_accel_start(16, 1, s3->accel.pix_trans[0] | (s3->accel.pix_trans[1] << 8), 0, s3); From a72d1d728b345a156af863bc151986349b9aa6ef Mon Sep 17 00:00:00 2001 From: TC1995 Date: Sat, 11 Jul 2020 19:55:45 +0200 Subject: [PATCH 2/2] Fix horizontal screen bug in 15bpp mode of the 928. --- src/video/vid_s3.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/video/vid_s3.c b/src/video/vid_s3.c index a86a20584..edefbf818 100644 --- a/src/video/vid_s3.c +++ b/src/video/vid_s3.c @@ -1651,8 +1651,13 @@ void s3_recalctimings(svga_t *svga) break; case 15: svga->render = svga_render_15bpp_highres; - if (s3->chip != S3_VISION964 && s3->chip != S3_86C801 && s3->chip != S3_86C928 && s3->chip != S3_86C911) - svga->hdisp /= 2; + if (s3->chip != S3_VISION964 && s3->chip != S3_86C801) + { + if (s3->chip == S3_86C928) + svga->hdisp *= 2; + else + svga->hdisp /= 2; + } break; case 16: svga->render = svga_render_16bpp_highres;