Merge pull request #4195 from Cacodemon345/patch-164

S3 ViRGE: a bit of cleanup
This commit is contained in:
Miran Grča
2024-02-23 16:52:39 +01:00
committed by GitHub

View File

@@ -893,6 +893,7 @@ s3_virge_recalctimings(svga_t *svga)
}
}
svga->vram_display_mask = (!(svga->crtc[0x31] & 0x08) && (svga->crtc[0x32] & 0x40)) ? 0x3ffff : virge->vram_mask;
svga->overlay.ena = 0;
s3_virge_log("VGA mode\n");
} else /*Streams mode*/
{
@@ -923,7 +924,7 @@ s3_virge_recalctimings(svga_t *svga)
} else if (virge->chip == S3_VIRGEGX2 && svga->overlay.ena) {
/* 0x20 = Secondary Stream enabled */
/* 0x2000 = Primary Stream enabled */
svga->overlay.ena = !!(virge->streams.blend_ctrl & 0x20) && (svga->crtc[0x67] & 0xC);
svga->overlay.ena = !!(virge->streams.blend_ctrl & 0x20);
}
switch ((virge->streams.pri_ctrl >> 24) & 0x7) {