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

Merge pull request #867 from 86Box/bugfix/s3_911_win3x

Browse Source 
Evidently pixel cntl 0x80 (CPU data determines mix register) isn't ha…
This commit is contained in:
Miran Grča
2020-06-25 16:56:35 +02:00
committed by GitHub
parent 93146f5eb2 41529d2d46
commit 1ae91c6eff
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/video/vid_s3.c
View File

@@ -695,7 +695,7 @@ static void s3_accel_out_fifo_w(s3_t *s3, uint16_t port, uint16_t val)
{ {
if (s3->accel.cmd & 0x100) if (s3->accel.cmd & 0x100)
{ {
if ((s3->accel.multifunc[0xa] & 0xc0) == 0x80) if ((s3->accel.multifunc[0xa] & 0xc0) == 0x80 && (s3->chip != S3_86C911))
{ {
if (s3->accel.cmd & 0x1000) if (s3->accel.cmd & 0x1000)
val = (val >> 8) | (val << 8); val = (val >> 8) | (val << 8);
@@ -704,7 +704,7 @@ static void s3_accel_out_fifo_w(s3_t *s3, uint16_t port, uint16_t val)
s3_accel_start(8, 1, (val >> 8) & 0xff, 0, s3); s3_accel_start(8, 1, (val >> 8) & 0xff, 0, s3);
s3_accel_start(8, 1, val & 0xff, 0, s3); s3_accel_start(8, 1, val & 0xff, 0, s3);
} }
if ((s3->accel.cmd & 0x600) == 0x000) else if ((s3->accel.cmd & 0x600) == 0x000)
s3_accel_start(8, 1, val | (val << 16), 0, s3); s3_accel_start(8, 1, val | (val << 16), 0, s3);
else else
s3_accel_start(16, 1, val | (val << 16), 0, s3); s3_accel_start(16, 1, val | (val << 16), 0, s3);