claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #4034 from 86Box/tc1995

Browse Source 
Corrected S3 864 horizontal display.
This commit is contained in:
Miran Grča
2024-01-13 17:51:09 +01:00
committed by GitHub
parent a1163ac091 de1e98d3ec
commit a55b64a3dd
1 changed files with 9 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/video/vid_s3.c
View File

@@ -3538,17 +3538,10 @@ s3_recalctimings(svga_t *svga)
} }
break; break;
case S3_VISION864: case S3_VISION864:
switch (s3->card_type) {
case S3_MIROCRYSTAL20SD_864:
svga->hdisp >>= 1; svga->hdisp >>= 1;
svga->hblankstart = ((svga->hblankstart - 1) >> 1) + 1; svga->hblankstart = ((svga->hblankstart - 1) >> 1) + 1;
svga->hblank_end_val >>= 1; svga->hblank_end_val >>= 1;
break; break;
default:
break;
}
break;
case S3_VISION964: case S3_VISION964:
switch (s3->card_type) { switch (s3->card_type) {
case S3_ELSAWIN2KPROX_964: case S3_ELSAWIN2KPROX_964:
@@ -3739,17 +3732,10 @@ s3_recalctimings(svga_t *svga)
} }
break; break;
case S3_VISION864: case S3_VISION864:
switch (s3->card_type) {
case S3_MIROCRYSTAL20SD_864:
svga->hdisp >>= 1; svga->hdisp >>= 1;
svga->hblankstart = ((svga->hblankstart - 1) >> 1) + 1; svga->hblankstart = ((svga->hblankstart - 1) >> 1) + 1;
svga->hblank_end_val >>= 1; svga->hblank_end_val >>= 1;
break; break;
default:
break;
}
break;
case S3_VISION868: case S3_VISION868:
switch (s3->card_type) { switch (s3->card_type) {
case S3_PHOENIX_VISION868: case S3_PHOENIX_VISION868:
@@ -3907,16 +3893,10 @@ s3_recalctimings(svga_t *svga)
} }
break; break;
case S3_VISION864: case S3_VISION864:
switch (s3->card_type) {
case S3_MIROCRYSTAL20SD_864:
svga->hdisp = (svga->hdisp << 1) / 3; svga->hdisp = (svga->hdisp << 1) / 3;
svga->hblankstart = (((svga->hblankstart - 1) << 1) / 3) + 1; svga->hblankstart = (((svga->hblankstart - 1) << 1) / 3) + 1;
svga->hblank_end_val = (svga->hblank_end_val << 1) / 3; svga->hblank_end_val = (svga->hblank_end_val << 1) / 3;
break; break;
default:
break;
}
break;
case S3_VISION968: case S3_VISION968:
switch (s3->card_type) { switch (s3->card_type) {
case S3_MIROVIDEO40SV_ERGO_968: case S3_MIROVIDEO40SV_ERGO_968: