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

Fixed some fatal's that turned out to be missing parts of the blt and the width bpp.

Browse Source
This commit is contained in:
TC1995
2020-01-19 01:19:40 +01:00
parent d4508e434b
commit e6c75a7f1a
1 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/video/vid_mga.c
View File

@@ -234,6 +234,7 @@
#define DWGCTRL_OPCODE_MASK (0xf << 0) #define DWGCTRL_OPCODE_MASK (0xf << 0)
#define DWGCTRL_OPCODE_LINE_OPEN (0x0 << 0) #define DWGCTRL_OPCODE_LINE_OPEN (0x0 << 0)
#define DWGCTRL_OPCODE_AUTOLINE_OPEN (0x1 << 0) #define DWGCTRL_OPCODE_AUTOLINE_OPEN (0x1 << 0)
#define DWGCTRL_OPCODE_LINE_CLOSE (0x2 << 0)
#define DWGCTRL_OPCODE_AUTOLINE_CLOSE (0x3 << 0) #define DWGCTRL_OPCODE_AUTOLINE_CLOSE (0x3 << 0)
#define DWGCTRL_OPCODE_TRAP (0x4 << 0) #define DWGCTRL_OPCODE_TRAP (0x4 << 0)
#define DWGCTRL_OPCODE_TEXTURE_TRAP (0x6 << 0) #define DWGCTRL_OPCODE_TEXTURE_TRAP (0x6 << 0)
@@ -4111,6 +4112,15 @@ blit_bitblt(mystique_t *mystique)
svga->changedvram[(((mystique->dwgreg.ydst_lin + x) * 3) & mystique->vram_mask) >> 12] = changeframecount; svga->changedvram[(((mystique->dwgreg.ydst_lin + x) * 3) & mystique->vram_mask) >> 12] = changeframecount;
break; break;
case MACCESS_PWIDTH_32:
dst = ((uint32_t *)svga->vram)[(mystique->dwgreg.ydst_lin + x) & mystique->vram_mask_l];
dst = bitop(src, dst, mystique->dwgreg.dwgctrl_running);
((uint32_t *)svga->vram)[(mystique->dwgreg.ydst_lin + x) & mystique->vram_mask_l] = dst;
svga->changedvram[((mystique->dwgreg.ydst_lin + x) & mystique->vram_mask_l) >> 10] = changeframecount;
break;
default: default:
fatal("BITBLT RPL BMONOLEF PWIDTH %x %08x\n", mystique->maccess_running & MACCESS_PWIDTH_MASK, mystique->dwgreg.dwgctrl_running); fatal("BITBLT RPL BMONOLEF PWIDTH %x %08x\n", mystique->maccess_running & MACCESS_PWIDTH_MASK, mystique->dwgreg.dwgctrl_running);
} }
@@ -4437,6 +4447,10 @@ mystique_start_blit(mystique_t *mystique)
blit_autoline(mystique, 0); blit_autoline(mystique, 0);
break; break;
case DWGCTRL_OPCODE_LINE_CLOSE:
blit_line(mystique, 1);
break;
case DWGCTRL_OPCODE_AUTOLINE_CLOSE: case DWGCTRL_OPCODE_AUTOLINE_CLOSE:
blit_autoline(mystique, 1); blit_autoline(mystique, 1);
break; break;
@@ -4478,7 +4492,8 @@ mystique_start_blit(mystique_t *mystique)
break; break;
default: default:
fatal("mystique_start_blit: unknown blit %08x\n", mystique->dwgreg.dwgctrl_running); fatal("mystique_start_blit: unknown blit %08x\n", mystique->dwgreg.dwgctrl_running & DWGCTRL_OPCODE_MASK);
break;
} }
end_time = plat_timer_read(); end_time = plat_timer_read();