claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'bugfixes' of https://github.com/starfrost013/86Box into bugfixes

Browse Source
This commit is contained in:
starfrost013
2025-06-21 00:39:51 +01:00
parent bba8f4d499 dd305a174c
commit fee6be8c99
3 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/video/vid_svga.c
View File

@@ -956,14 +956,18 @@ svga_recalctimings(svga_t *svga)
svga->hdisp -= (svga->hblank_sub * svga->dots_per_clock);
svga->left_overscan = svga->x_add = (svga->htotal - adj_dot - 1) * svga->dots_per_clock;
svga->monitor->mon_overscan_x = svga->x_add + (svga->hblankstart * svga->dots_per_clock) - hd;
svga->monitor->mon_overscan_x = svga->x_add + (svga->hblankstart * svga->dots_per_clock) - hd + svga->dots_per_clock;
/* Compensate for the HDISP code above. */
if (svga->crtc[1] & 1)
svga->monitor->mon_overscan_x++;
if ((svga->hdisp >= 2048) || (svga->left_overscan < 0)) {
svga->left_overscan = svga->x_add = 0;
svga->monitor->mon_overscan_x = 0;
}
svga->y_add = svga->vtotal - vblankend + 1;
/* - 1 because + 1 but also - 2 to compensate for the + 2 added to vtotal above. */
svga->y_add = svga->vtotal - vblankend - 1;
svga->monitor->mon_overscan_y = svga->y_add + abs(svga->vblankstart - svga->dispend);
if ((svga->dispend >= 2048) || (svga->y_add < 0)) {

4
src/video/vid_tandy.c
View File

@@ -483,7 +483,7 @@ vid_poll(void *priv)
vid->memaddr++;
if (vid->scanline & 8) {
for (c = 0; c < 8; c++)
buffer32->line[vid->displine << 1][(x << 4) + (c << 1) + 8] = buffer32->line[vid->displine << 1][(x << 4) + (c << 1) + 1 + 8] = cols[0];
buffer32->line[vid->displine << 1][(x << 4) + (c << 1) + 8] = buffer32->line[(vid->displine << 1) + 1][(x << 4) + (c << 1) + 8] = buffer32->line[vid->displine << 1][(x << 4) + (c << 1) + 1 + 8] = buffer32->line[(vid->displine << 1) + 1][(x << 4) + (c << 1) + 1 + 8] = cols[0];
} else {
for (c = 0; c < 8; c++) {
if (vid->scanline == 8) {
@@ -824,4 +824,4 @@ const device_t tandy_1000sl_video_device = {
.speed_changed = tandy_vid_speed_changed,
.force_redraw = NULL,
.config = NULL
};
};

1
src/video/vid_voodoo.c
View File

@@ -530,6 +530,7 @@ voodoo_writel(uint32_t addr, uint32_t val, void *priv)
voodoo_recalc(voodoo);
voodoo->front_offset = voodoo->params.front_offset;
}
svga_recalctimings(voodoo->svga);
}
break;
case SST_fbiInit1: