mirror of
https://github.com/86Box/86Box.git
synced 2025-01-23 01:31:51 -05:00
EGA and (S)VGA: Removed a leftover if block around overscan Y, fixes garbage overscan Y values causing crashes.
This commit is contained in:
parent
b0ca256065
commit
79874ad3d5
2 changed files with 9 additions and 15 deletions
|
@ -543,12 +543,10 @@ ega_recalctimings(ega_t *ega)
|
|||
}
|
||||
}
|
||||
|
||||
if (enable_overscan) {
|
||||
overscan_y = (ega->rowcount + 1) << 1;
|
||||
overscan_y = (ega->rowcount + 1) << 1;
|
||||
|
||||
if (overscan_y < 16)
|
||||
overscan_y = 16;
|
||||
}
|
||||
if (overscan_y < 16)
|
||||
overscan_y = 16;
|
||||
|
||||
overscan_x = (ega->seqregs[1] & 1) ? 16 : 18;
|
||||
|
||||
|
|
|
@ -92,12 +92,10 @@ svga_set_override(svga_t *svga, int val)
|
|||
|
||||
if (!val) {
|
||||
/* Override turned off, restore overscan X and Y per the CRTC. */
|
||||
if (enable_overscan) {
|
||||
svga->monitor->mon_overscan_y = (svga->rowcount + 1) << 1;
|
||||
svga->monitor->mon_overscan_y = (svga->rowcount + 1) << 1;
|
||||
|
||||
if (svga->monitor->mon_overscan_y < 16)
|
||||
svga->monitor->mon_overscan_y = 16;
|
||||
}
|
||||
if (svga->monitor->mon_overscan_y < 16)
|
||||
svga->monitor->mon_overscan_y = 16;
|
||||
|
||||
svga->monitor->mon_overscan_x = (svga->seqregs[1] & 1) ? 16 : 18;
|
||||
|
||||
|
@ -711,12 +709,10 @@ svga_recalctimings(svga_t *svga)
|
|||
svga->linedbl = svga->crtc[9] & 0x80;
|
||||
svga->char_width = (svga->seqregs[1] & 1) ? 8 : 9;
|
||||
|
||||
if (enable_overscan) {
|
||||
svga->monitor->mon_overscan_y = (svga->rowcount + 1) << 1;
|
||||
svga->monitor->mon_overscan_y = (svga->rowcount + 1) << 1;
|
||||
|
||||
if (svga->monitor->mon_overscan_y < 16)
|
||||
svga->monitor->mon_overscan_y = 16;
|
||||
}
|
||||
if (svga->monitor->mon_overscan_y < 16)
|
||||
svga->monitor->mon_overscan_y = 16;
|
||||
|
||||
if (!(svga->gdcreg[6] & 1) && !(svga->attrregs[0x10] & 1)) {
|
||||
svga->monitor->mon_overscan_x = (svga->seqregs[1] & 1) ? 16 : 18;
|
||||
|
|
Loading…
Reference in a new issue