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

Fix the dword mode fix in the S3 code.

Browse Source
This commit is contained in:
TC1995
2021-09-05 19:25:16 +02:00
parent 16c7b632b6
commit 1c634759c5
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/video/vid_s3.c
View File

@@ -2713,8 +2713,10 @@ static void s3_recalctimings(svga_t *svga)
if (((svga->gdcreg[5] & 0x40) && (svga->crtc[0x3a] & 0x10)) || (svga->crtc[0x3a] & 0x10)) { if (((svga->gdcreg[5] & 0x40) && (svga->crtc[0x3a] & 0x10)) || (svga->crtc[0x3a] & 0x10)) {
if (svga->crtc[0x31] & 0x08) { /*If the dword mode bit is not enabled when the S3 dword mode is enabled, enable it*/ if (svga->crtc[0x31] & 0x08) { /*If the dword mode bit is not enabled when the S3 dword mode is enabled, enable it*/
if (!(svga->crtc[0x14] & 0x40)) if (!(svga->crtc[0x14] & 0x40))
svga->crtc[0x14] |= 0x40; svga->force_dword_mode = 1;
} } else
svga->force_dword_mode = 0;
switch (svga->bpp) { switch (svga->bpp) {
case 8: case 8:
svga->render = svga_render_8bpp_highres; svga->render = svga_render_8bpp_highres;
@@ -2851,10 +2853,12 @@ static void s3_trio64v_recalctimings(svga_t *svga)
svga->lowres = !((svga->gdcreg[5] & 0x40) && (svga->crtc[0x3a] & 0x10)); svga->lowres = !((svga->gdcreg[5] & 0x40) && (svga->crtc[0x3a] & 0x10));
if ((svga->gdcreg[5] & 0x40) && (svga->crtc[0x3a] & 0x10)) { if ((svga->gdcreg[5] & 0x40) && (svga->crtc[0x3a] & 0x10)) {
if (svga->crtc[0x31] & 0x08) { if (svga->crtc[0x31] & 0x08) { /*If the dword mode bit is not enabled when the S3 dword mode is enabled, enable it*/
if (!(svga->crtc[0x14] & 0x40)) if (!(svga->crtc[0x14] & 0x40))
svga->crtc[0x14] |= 0x40; svga->force_dword_mode = 1;
} } else
svga->force_dword_mode = 0;
switch (svga->bpp) { switch (svga->bpp) {
case 8: case 8:
svga->render = svga_render_8bpp_highres; svga->render = svga_render_8bpp_highres;