80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

Merge pull request #3990 from 86Box/tc1995

Browse Source 
S3 mode fixes (1):
This commit is contained in:
Miran Grča
2024-01-04 00:41:42 +01:00
committed by GitHub
parent 356ac8acbe 4317155167
commit d62a82af4d
1 changed files with 75 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
src/video/vid_s3.c
View File

@@ -3233,7 +3233,7 @@ s3_recalctimings(svga_t *svga)
#endif #endif
if ((svga->gdcreg[5] & 0x40) && (svga->crtc[0x3a] & 0x10)) { if ((svga->gdcreg[5] & 0x40) && (svga->crtc[0x3a] & 0x10)) {
//pclog("BPP=%d, pitch=%d, width=%02x, double?=%x, 16bit?=%d, highres?=%d, attr=%02x.\n", svga->bpp, s3->width, svga->crtc[0x50], svga->crtc[0x31] & 0x02, s3->color_16bit, s3->accel.advfunc_cntl & 4, svga->attrregs[0x10] & 0x40); pclog("BPP=%d, pitch=%d, width=%02x, double?=%x, 16bit?=%d, highres?=%d, attr=%02x.\n", svga->bpp, s3->width, svga->crtc[0x50], svga->crtc[0x31] & 0x02, s3->color_16bit, s3->accel.advfunc_cntl & 4, svga->attrregs[0x10] & 0x40);
switch (svga->bpp) { switch (svga->bpp) {
case 8: case 8:
svga->render = svga_render_8bpp_highres; svga->render = svga_render_8bpp_highres;
@@ -3433,6 +3433,23 @@ s3_recalctimings(svga_t *svga)
break; break;
} }
break; break;
case S3_VISION964:
switch (s3->card_type) {
case S3_ELSAWIN2KPROX_964:
switch (s3->width) {
case 1280:
case 1600:
svga->hdisp <<= 1;
break;
default:
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:
@@ -3452,7 +3469,16 @@ s3_recalctimings(svga_t *svga)
if (svga->hdisp == 832) if (svga->hdisp == 832)
svga->hdisp -= 32; svga->hdisp -= 32;
break; break;
case S3_ELSAWIN2KPROX:
switch (s3->width) {
case 1280:
case 1600:
svga->hdisp <<= 1;
break;
default:
break;
}
break;
default: default:
break; break;
} }
@@ -3585,6 +3611,23 @@ s3_recalctimings(svga_t *svga)
break; break;
} }
break; break;
case S3_VISION964:
switch (s3->card_type) {
case S3_ELSAWIN2KPROX_964:
switch (s3->width) {
case 1280:
case 1600:
svga->hdisp <<= 1;
break;
default:
break;
}
break;
default:
break;
}
break;
case S3_VISION968: case S3_VISION968:
switch (s3->card_type) { switch (s3->card_type) {
case S3_NUMBER9_9FX_771: case S3_NUMBER9_9FX_771:
@@ -3593,7 +3636,16 @@ s3_recalctimings(svga_t *svga)
if (svga->hdisp == 832) if (svga->hdisp == 832)
svga->hdisp -= 32; svga->hdisp -= 32;
break; break;
case S3_ELSAWIN2KPROX:
switch (s3->width) {
case 1280:
case 1600:
svga->hdisp <<= 1;
break;
default:
break;
}
break;
default: default:
break; break;
} }
@@ -3760,6 +3812,16 @@ s3_recalctimings(svga_t *svga)
break; break;
} }
break; break;
case S3_ELSAWIN2KPROX_964:
switch (s3->width) {
case 1280:
case 1600:
svga->hdisp <<= 1;
break;
default:
break;
}
break;
default: default:
break; break;
} }
@@ -3772,6 +3834,16 @@ s3_recalctimings(svga_t *svga)
if (svga->hdisp == 832) if (svga->hdisp == 832)
svga->hdisp -= 32; svga->hdisp -= 32;
break; break;
case S3_ELSAWIN2KPROX:
switch (s3->width) {
case 1280:
case 1600:
svga->hdisp <<= 1;
break;
default:
break;
}
break;
default: default:
break; break;
} }