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

Fixed remaining crashes of the ViRGE that were due to my previous fix.

Browse Source
This commit is contained in:
TC1995
2017-07-27 22:24:33 +02:00
parent ea2735d0b2
commit 8bf4ff71c1
1 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/VIDEO/vid_s3_virge.c
View File

@@ -1350,18 +1350,27 @@ static void s3_virge_mmio_write_l(uint32_t addr, uint32_t val, void *p)
svga_t *svga = &virge->svga; svga_t *svga = &virge->svga;
reg_writes++; reg_writes++;
pclog("Write Address %x\n", addr & 0xe000);
if ((addr & 0xfffc) < 0x8000) if ((addr & 0xfffc) < 0x8000)
{ {
if ((addr & 0xe000) == 0)
{
if (virge->s3d.cmd_set & CMD_SET_MS)
s3_virge_bitblt(virge, 32, ((val & 0xff000000) >> 24) | ((val & 0x00ff0000) >> 8) | ((val & 0x0000ff00) << 8) | ((val & 0x000000ff) << 24));
else
s3_virge_bitblt(virge, 32, val);
}
else
{
s3_virge_queue(virge, addr, val, FIFO_WRITE_DWORD); s3_virge_queue(virge, addr, val, FIFO_WRITE_DWORD);
}
} }
else switch (addr & 0xfffc) else switch (addr & 0xfffc)
{ {
case 0: case 0:
s3_virge_queue(virge, addr, val, FIFO_WRITE_DWORD); if (virge->s3d.cmd_set & CMD_SET_MS)
svga_recalctimings(svga); s3_virge_bitblt(virge, 32, ((val & 0xff000000) >> 24) | ((val & 0x00ff0000) >> 8) | ((val & 0x0000ff00) << 8) | ((val & 0x000000ff) << 24));
svga->fullchange = changeframecount; else
s3_virge_bitblt(virge, 32, val);
break; break;
case 0x8180: case 0x8180: