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

Merge pull request #2412 from 86Box/tc1995

Browse Source 
EGA fixes to its renderer.
This commit is contained in:
Miran Grča
2022-06-26 23:17:40 +02:00
committed by GitHub
parent bcc1fdb7bc 7ca64ced86
commit c17a3503e2
1 changed files with 94 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

208
src/video/vid_ega_render.c
View File

@@ -254,47 +254,42 @@ ega_render_2bpp_lowres(ega_t *ega)
int x; int x;
uint8_t dat[2]; uint8_t dat[2];
uint32_t addr, *p; uint32_t addr, *p;
uint32_t changed_addr;
if ((ega->displine + ega->y_add) < 0) if ((ega->displine + ega->y_add) < 0)
return; return;
changed_addr = ega->remap_func(ega, ega->ma); p = &buffer32->line[ega->displine + ega->y_add][ega->x_add];
if (fullchange) { if (ega->firstline_draw == 2000)
p = &buffer32->line[ega->displine + ega->y_add][ega->x_add]; ega->firstline_draw = ega->displine;
ega->lastline_draw = ega->displine;
if (ega->firstline_draw == 2000) for (x = 0; x <= (ega->hdisp + ega->scrollcache); x += 16) {
ega->firstline_draw = ega->displine; addr = ega->remap_func(ega, ega->ma);
ega->lastline_draw = ega->displine;
for (x = 0; x <= (ega->hdisp + ega->scrollcache); x += 16) { dat[0] = ega->vram[addr];
addr = ega->remap_func(ega, ega->ma); dat[1] = ega->vram[addr | 0x1];
if (ega->seqregs[1] & 4)
ega->ma += 2;
else
ega->ma += 4;
dat[0] = ega->vram[addr]; ega->ma &= ega->vrammask;
dat[1] = ega->vram[addr | 0x1];
if (ega->seqregs[1] & 4)
ega->ma += 2;
else
ega->ma += 4;
ega->ma &= ega->vrammask; if (ega->crtc[0x17] & 0x80) {
p[0] = p[1] = ega->pallook[ega->egapal[(dat[0] >> 6) & 3]];
p[2] = p[3] = ega->pallook[ega->egapal[(dat[0] >> 4) & 3]];
p[4] = p[5] = ega->pallook[ega->egapal[(dat[0] >> 2) & 3]];
p[6] = p[7] = ega->pallook[ega->egapal[dat[0] & 3]];
p[8] = p[9] = ega->pallook[ega->egapal[(dat[1] >> 6) & 3]];
p[10] = p[11] = ega->pallook[ega->egapal[(dat[1] >> 4) & 3]];
p[12] = p[13] = ega->pallook[ega->egapal[(dat[1] >> 2) & 3]];
p[14] = p[15] = ega->pallook[ega->egapal[dat[1] & 3]];
} else
memset(p, 0x00, 16 * sizeof(uint32_t));
if (ega->crtc[0x17] & 0x80) { p += 16;
p[0] = p[1] = ega->pallook[ega->egapal[(dat[0] >> 6) & 3]]; }
p[2] = p[3] = ega->pallook[ega->egapal[(dat[0] >> 4) & 3]];
p[4] = p[5] = ega->pallook[ega->egapal[(dat[0] >> 2) & 3]];
p[6] = p[7] = ega->pallook[ega->egapal[dat[0] & 3]];
p[8] = p[9] = ega->pallook[ega->egapal[(dat[1] >> 6) & 3]];
p[10] = p[11] = ega->pallook[ega->egapal[(dat[1] >> 4) & 3]];
p[12] = p[13] = ega->pallook[ega->egapal[(dat[1] >> 2) & 3]];
p[14] = p[15] = ega->pallook[ega->egapal[dat[1] & 3]];
} else
memset(p, 0x00, 16 * sizeof(uint32_t));
p += 16;
}
}
} }
@@ -304,14 +299,10 @@ ega_render_2bpp_highres(ega_t *ega)
int x; int x;
uint8_t dat[2]; uint8_t dat[2];
uint32_t addr, *p; uint32_t addr, *p;
uint32_t changed_addr;
if ((ega->displine + ega->y_add) < 0) if ((ega->displine + ega->y_add) < 0)
return; return;
changed_addr = ega->remap_func(ega, ega->ma);
if (fullchange) {
p = &buffer32->line[ega->displine + ega->y_add][ega->x_add]; p = &buffer32->line[ega->displine + ega->y_add][ega->x_add];
if (ega->firstline_draw == 2000) if (ega->firstline_draw == 2000)
@@ -344,7 +335,6 @@ ega_render_2bpp_highres(ega_t *ega)
p += 8; p += 8;
} }
}
} }
@@ -354,54 +344,49 @@ ega_render_4bpp_lowres(ega_t *ega)
int x, oddeven; int x, oddeven;
uint8_t dat, edat[4]; uint8_t dat, edat[4];
uint32_t addr, *p; uint32_t addr, *p;
uint32_t changed_addr;
if ((ega->displine + ega->y_add) < 0) if ((ega->displine + ega->y_add) < 0)
return; return;
changed_addr = ega->remap_func(ega, ega->ma); p = &buffer32->line[ega->displine + ega->y_add][ega->x_add];
if (fullchange) { if (ega->firstline_draw == 2000)
p = &buffer32->line[ega->displine + ega->y_add][ega->x_add]; ega->firstline_draw = ega->displine;
ega->lastline_draw = ega->displine;
if (ega->firstline_draw == 2000) for (x = 0; x <= (ega->hdisp + ega->scrollcache); x += 16) {
ega->firstline_draw = ega->displine; addr = ega->remap_func(ega, ega->ma);
ega->lastline_draw = ega->displine; oddeven = 0;
for (x = 0; x <= (ega->hdisp + ega->scrollcache); x += 16) { if (ega->seqregs[1] & 4) {
addr = ega->remap_func(ega, ega->ma); oddeven = (addr & 4) ? 1 : 0;
oddeven = 0; edat[0] = ega->vram[addr | oddeven];
edat[2] = ega->vram[addr | oddeven | 0x2];
edat[1] = edat[3] = 0;
ega->ma += 2;
} else {
*(uint32_t *)(&edat[0]) = *(uint32_t *)(&ega->vram[addr]);
ega->ma += 4;
}
ega->ma &= ega->vrammask;
if (ega->seqregs[1] & 4) { if (ega->crtc[0x17] & 0x80) {
oddeven = (addr & 4) ? 1 : 0; dat = edatlookup[edat[0] >> 6][edat[1] >> 6] | (edatlookup[edat[2] >> 6][edat[3] >> 6] << 2);
edat[0] = ega->vram[addr | oddeven]; p[0] = p[1] = ega->pallook[ega->egapal[(dat >> 4) & ega->plane_mask]];
edat[2] = ega->vram[addr | oddeven | 0x2]; p[2] = p[3] = ega->pallook[ega->egapal[dat & ega->plane_mask]];
edat[1] = edat[3] = 0; dat = edatlookup[(edat[0] >> 4) & 3][(edat[1] >> 4) & 3] | (edatlookup[(edat[2] >> 4) & 3][(edat[3] >> 4) & 3] << 2);
ega->ma += 2; p[4] = p[5] = ega->pallook[ega->egapal[(dat >> 4) & ega->plane_mask]];
} else { p[6] = p[7] = ega->pallook[ega->egapal[dat & ega->plane_mask]];
*(uint32_t *)(&edat[0]) = *(uint32_t *)(&ega->vram[addr]); dat = edatlookup[(edat[0] >> 2) & 3][(edat[1] >> 2) & 3] | (edatlookup[(edat[2] >> 2) & 3][(edat[3] >> 2) & 3] << 2);
ega->ma += 4; p[8] = p[9] = ega->pallook[ega->egapal[(dat >> 4) & ega->plane_mask]];
} p[10] = p[11] = ega->pallook[ega->egapal[dat & ega->plane_mask]];
ega->ma &= ega->vrammask; dat = edatlookup[edat[0] & 3][edat[1] & 3] | (edatlookup[edat[2] & 3][edat[3] & 3] << 2);
p[12] = p[13] = ega->pallook[ega->egapal[(dat >> 4) & ega->plane_mask]];
p[14] = p[15] = ega->pallook[ega->egapal[dat & ega->plane_mask]];
} else
memset(p, 0x00, 16 * sizeof(uint32_t));
if (ega->crtc[0x17] & 0x80) { p += 16;
dat = edatlookup[edat[0] >> 6][edat[1] >> 6] | (edatlookup[edat[2] >> 6][edat[3] >> 6] << 2);
p[0] = p[1] = ega->pallook[ega->egapal[(dat >> 4) & ega->plane_mask]];
p[2] = p[3] = ega->pallook[ega->egapal[dat & ega->plane_mask]];
dat = edatlookup[(edat[0] >> 4) & 3][(edat[1] >> 4) & 3] | (edatlookup[(edat[2] >> 4) & 3][(edat[3] >> 4) & 3] << 2);
p[4] = p[5] = ega->pallook[ega->egapal[(dat >> 4) & ega->plane_mask]];
p[6] = p[7] = ega->pallook[ega->egapal[dat & ega->plane_mask]];
dat = edatlookup[(edat[0] >> 2) & 3][(edat[1] >> 2) & 3] | (edatlookup[(edat[2] >> 2) & 3][(edat[3] >> 2) & 3] << 2);
p[8] = p[9] = ega->pallook[ega->egapal[(dat >> 4) & ega->plane_mask]];
p[10] = p[11] = ega->pallook[ega->egapal[dat & ega->plane_mask]];
dat = edatlookup[edat[0] & 3][edat[1] & 3] | (edatlookup[edat[2] & 3][edat[3] & 3] << 2);
p[12] = p[13] = ega->pallook[ega->egapal[(dat >> 4) & ega->plane_mask]];
p[14] = p[15] = ega->pallook[ega->egapal[dat & ega->plane_mask]];
} else
memset(p, 0x00, 16 * sizeof(uint32_t));
p += 16;
}
} }
} }
@@ -412,53 +397,48 @@ ega_render_4bpp_highres(ega_t *ega)
int x, oddeven; int x, oddeven;
uint8_t dat, edat[4]; uint8_t dat, edat[4];
uint32_t addr, *p; uint32_t addr, *p;
uint32_t changed_addr;
if ((ega->displine + ega->y_add) < 0) if ((ega->displine + ega->y_add) < 0)
return; return;
changed_addr = ega->remap_func(ega, ega->ma); p = &buffer32->line[ega->displine + ega->y_add][ega->x_add];
if (fullchange) { if (ega->firstline_draw == 2000)
p = &buffer32->line[ega->displine + ega->y_add][ega->x_add]; ega->firstline_draw = ega->displine;
ega->lastline_draw = ega->displine;
if (ega->firstline_draw == 2000) for (x = 0; x <= (ega->hdisp + ega->scrollcache); x += 8) {
ega->firstline_draw = ega->displine; addr = ega->remap_func(ega, ega->ma);
ega->lastline_draw = ega->displine; oddeven = 0;
for (x = 0; x <= (ega->hdisp + ega->scrollcache); x += 8) { if (ega->seqregs[1] & 4) {
addr = ega->remap_func(ega, ega->ma); oddeven = (addr & 4) ? 1 : 0;
oddeven = 0; edat[0] = ega->vram[addr | oddeven];
edat[2] = ega->vram[addr | oddeven | 0x2];
edat[1] = edat[3] = 0;
ega->ma += 2;
} else {
*(uint32_t *)(&edat[0]) = *(uint32_t *)(&ega->vram[addr]);
ega->ma += 4;
}
ega->ma &= ega->vrammask;
if (ega->seqregs[1] & 4) { if (ega->crtc[0x17] & 0x80) {
oddeven = (addr & 4) ? 1 : 0; dat = edatlookup[edat[0] >> 6][edat[1] >> 6] | (edatlookup[edat[2] >> 6][edat[3] >> 6] << 2);
edat[0] = ega->vram[addr | oddeven]; p[0] = ega->pallook[ega->egapal[(dat >> 4) & ega->plane_mask]];
edat[2] = ega->vram[addr | oddeven | 0x2]; p[1] = ega->pallook[ega->egapal[dat & ega->plane_mask]];
edat[1] = edat[3] = 0; dat = edatlookup[(edat[0] >> 4) & 3][(edat[1] >> 4) & 3] | (edatlookup[(edat[2] >> 4) & 3][(edat[3] >> 4) & 3] << 2);
ega->ma += 2; p[2] = ega->pallook[ega->egapal[(dat >> 4) & ega->plane_mask]];
} else { p[3] = ega->pallook[ega->egapal[dat & ega->plane_mask]];
*(uint32_t *)(&edat[0]) = *(uint32_t *)(&ega->vram[addr]); dat = edatlookup[(edat[0] >> 2) & 3][(edat[1] >> 2) & 3] | (edatlookup[(edat[2] >> 2) & 3][(edat[3] >> 2) & 3] << 2);
ega->ma += 4; p[4] = ega->pallook[ega->egapal[(dat >> 4) & ega->plane_mask]];
} p[5] = ega->pallook[ega->egapal[dat & ega->plane_mask]];
ega->ma &= ega->vrammask; dat = edatlookup[edat[0] & 3][edat[1] & 3] | (edatlookup[edat[2] & 3][edat[3] & 3] << 2);
p[6] = ega->pallook[ega->egapal[(dat >> 4) & ega->plane_mask]];
p[7] = ega->pallook[ega->egapal[dat & ega->plane_mask]];
} else
memset(p, 0x00, 8 * sizeof(uint32_t));
if (ega->crtc[0x17] & 0x80) { p += 8;
dat = edatlookup[edat[0] >> 6][edat[1] >> 6] | (edatlookup[edat[2] >> 6][edat[3] >> 6] << 2);
p[0] = ega->pallook[ega->egapal[(dat >> 4) & ega->plane_mask]];
p[1] = ega->pallook[ega->egapal[dat & ega->plane_mask]];
dat = edatlookup[(edat[0] >> 4) & 3][(edat[1] >> 4) & 3] | (edatlookup[(edat[2] >> 4) & 3][(edat[3] >> 4) & 3] << 2);
p[2] = ega->pallook[ega->egapal[(dat >> 4) & ega->plane_mask]];
p[3] = ega->pallook[ega->egapal[dat & ega->plane_mask]];
dat = edatlookup[(edat[0] >> 2) & 3][(edat[1] >> 2) & 3] | (edatlookup[(edat[2] >> 2) & 3][(edat[3] >> 2) & 3] << 2);
p[4] = ega->pallook[ega->egapal[(dat >> 4) & ega->plane_mask]];
p[5] = ega->pallook[ega->egapal[dat & ega->plane_mask]];
dat = edatlookup[edat[0] & 3][edat[1] & 3] | (edatlookup[edat[2] & 3][edat[3] & 3] << 2);
p[6] = ega->pallook[ega->egapal[(dat >> 4) & ega->plane_mask]];
p[7] = ega->pallook[ega->egapal[dat & ega->plane_mask]];
} else
memset(p, 0x00, 8 * sizeof(uint32_t));
p += 8;
}
} }
} }