Merge branch '86Box:master' into machine_23

2024-01-27 09:34:42 +01:00
parent 0e43058923 65a4ef6ae3
commit fc834decb9
30 changed files with 815 additions and 597 deletions
--- a/src/video/vid_s3.c
+++ b/src/video/vid_s3.c
@@ -3921,6 +3921,7 @@ s3_recalctimings(svga_t *svga)
                    case S3_VISION968:
                        switch (s3->card_type) {
                            case S3_MIROVIDEO40SV_ERGO_968:
+                            case S3_SPEA_MERCURY_P64V:
                                switch (s3->width) {
                                    case 1280:
                                        svga->hdisp = ((svga->hdisp << 1) / 3) << 1;