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

(S)VGA renderer fixes.

Browse Source
This commit is contained in:
OBattler
2022-07-19 00:14:29 +02:00
parent a555b9312d
commit 33c5f9397e
1 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/video/vid_svga_render.c
View File

@@ -1126,20 +1126,20 @@ svga_render_15bpp_lowres(svga_t *svga)
int x; int x;
uint32_t *p; uint32_t *p;
uint32_t dat; uint32_t dat;
uint32_t changed_addr, addr; uint32_t changed_addr, addr;
if ((svga->displine + svga->y_add) < 0) if ((svga->displine + svga->y_add) < 0)
return; return;
if (svga->force_old_addr) { if (svga->force_old_addr) {
if (svga->changedvram[svga->ma >> 12] || svga->changedvram[(svga->ma >> 12) + 1] || svga->fullchange) { if (svga->changedvram[svga->ma >> 12] || svga->changedvram[(svga->ma >> 12) + 1] || svga->fullchange) {
p = &buffer32->line[svga->displine + svga->y_add][svga->x_add]; p = &buffer32->line[svga->displine + svga->y_add][svga->x_add];
if (svga->firstline_draw == 2000) if (svga->firstline_draw == 2000)
svga->firstline_draw = svga->displine; svga->firstline_draw = svga->displine;
svga->lastline_draw = svga->displine; svga->lastline_draw = svga->displine;
if (svga->crtc[0x17] & 0x80) { for (x = 0; x <= (svga->hdisp + svga->scrollcache); x += 4) {
dat = *(uint32_t *)(&svga->vram[(svga->ma + (x << 1)) & svga->vram_display_mask]); dat = *(uint32_t *)(&svga->vram[(svga->ma + (x << 1)) & svga->vram_display_mask]);
p[(x << 1)] = p[(x << 1) + 1] = video_15to32[dat & 0xffff]; p[(x << 1)] = p[(x << 1) + 1] = video_15to32[dat & 0xffff];
@@ -1152,11 +1152,11 @@ svga_render_15bpp_lowres(svga_t *svga)
} }
svga->ma += x << 1; svga->ma += x << 1;
svga->ma &= svga->vram_display_mask; svga->ma &= svga->vram_display_mask;
} }
} else { } else {
changed_addr = svga->remap_func(svga, svga->ma); changed_addr = svga->remap_func(svga, svga->ma);
if (svga->changedvram[changed_addr >> 12] || svga->changedvram[(changed_addr >> 12) + 1] || svga->fullchange) { if (svga->changedvram[changed_addr >> 12] || svga->changedvram[(changed_addr >> 12) + 1] || svga->fullchange) {
p = &buffer32->line[svga->displine + svga->y_add][svga->x_add]; p = &buffer32->line[svga->displine + svga->y_add][svga->x_add];
if (svga->firstline_draw == 2000) if (svga->firstline_draw == 2000)
@@ -1187,8 +1187,8 @@ svga_render_15bpp_lowres(svga_t *svga)
} }
} }
svga->ma &= svga->vram_display_mask; svga->ma &= svga->vram_display_mask;
}
} }
}
} }
@@ -1198,13 +1198,13 @@ svga_render_15bpp_highres(svga_t *svga)
int x; int x;
uint32_t *p; uint32_t *p;
uint32_t dat; uint32_t dat;
uint32_t changed_addr, addr; uint32_t changed_addr, addr;
if ((svga->displine + svga->y_add) < 0) if ((svga->displine + svga->y_add) < 0)
return; return;
if (svga->force_old_addr) { if (svga->force_old_addr) {
if (svga->changedvram[svga->ma >> 12] || svga->changedvram[(svga->ma >> 12) + 1] || svga->fullchange) { if (svga->changedvram[svga->ma >> 12] || svga->changedvram[(svga->ma >> 12) + 1] || svga->fullchange) {
p = &buffer32->line[svga->displine + svga->y_add][svga->x_add]; p = &buffer32->line[svga->displine + svga->y_add][svga->x_add];
if (svga->firstline_draw == 2000) if (svga->firstline_draw == 2000)
@@ -1230,11 +1230,11 @@ svga_render_15bpp_highres(svga_t *svga)
} }
svga->ma += x << 1; svga->ma += x << 1;
svga->ma &= svga->vram_display_mask; svga->ma &= svga->vram_display_mask;
} }
} else { } else {
changed_addr = svga->remap_func(svga, svga->ma); changed_addr = svga->remap_func(svga, svga->ma);
if (svga->changedvram[changed_addr >> 12] || svga->changedvram[(changed_addr >> 12) + 1] || svga->fullchange) { if (svga->changedvram[changed_addr >> 12] || svga->changedvram[(changed_addr >> 12) + 1] || svga->fullchange) {
p = &buffer32->line[svga->displine + svga->y_add][svga->x_add]; p = &buffer32->line[svga->displine + svga->y_add][svga->x_add];
if (svga->firstline_draw == 2000) if (svga->firstline_draw == 2000)
@@ -1271,8 +1271,8 @@ svga_render_15bpp_highres(svga_t *svga)
} }
} }
svga->ma &= svga->vram_display_mask; svga->ma &= svga->vram_display_mask;
}
} }
}
} }