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

Applied mainline PCem commit: Fixed Mach64 1 bpp source data alignment - fixes font rendering in Windows NT.

Browse Source
This commit is contained in:
OBattler
2017-01-17 01:02:08 +01:00
parent 70cd63784b
commit 2c0b3112be
1 changed files with 31 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/vid_ati_mach64.c
View File

@@ -111,6 +111,8 @@ typedef struct mach64_t
uint32_t gui_traj_cntl;
uint32_t host_cntl;
uint32_t mem_cntl;
uint32_t ovr_clr;
@@ -243,6 +245,11 @@ enum
DST_24_ROT_EN = 0x80
};
enum
{
HOST_BYTE_ALIGN = (1 << 0)
};
void mach64_write(uint32_t addr, uint8_t val, void *priv);
uint8_t mach64_read(uint32_t addr, void *priv);
void mach64_updatemapping(mach64_t *mach64);
@@ -661,6 +668,10 @@ static void mach64_accel_write_fifo(mach64_t *mach64, uint32_t addr, uint8_t val
mach64_blit(val, 8, mach64);
break;
case 0x240: case 0x241: case 0x242: case 0x243:
WRITE8(addr, mach64->host_cntl, val);
break;
case 0x280: case 0x281: case 0x282: case 0x283:
WRITE8(addr, mach64->pat_reg0, val);
break;
@@ -725,6 +736,10 @@ static void mach64_accel_write_fifo(mach64_t *mach64, uint32_t addr, uint8_t val
break;
case 0x333:
WRITE8(addr - 3, mach64->pat_cntl, val & 7);
if (val & 0x10)
mach64->host_cntl |= HOST_BYTE_ALIGN;
else
mach64->host_cntl &= ~HOST_BYTE_ALIGN;
break;
}
}
@@ -1336,8 +1351,17 @@ void mach64_blit(uint32_t cpu_dat, int count, mach64_t *mach64)
mach64->dst_y_x = (mach64->dst_y_x & 0xfff0000) | ((mach64->dst_y_x + (mach64->dst_height_width & 0x1fff)) & 0xfff);
return;
}
if (mach64->accel.source_host)
return;
if (mach64->host_cntl & HOST_BYTE_ALIGN)
{
if (mach64->accel.source_mix == MONO_SRC_HOST)
{
if (mach64->dp_pix_width & DP_BYTE_PIX_ORDER)
cpu_dat >>= (count & 7);
else
cpu_dat <<= (count & 7);
count &= ~7;
}
}
}
}
break;
@@ -1770,6 +1794,11 @@ uint8_t mach64_ext_readb(uint32_t addr, void *p)
READ8(addr, mach64->src_cntl);
break;
case 0x240: case 0x241: case 0x242: case 0x243:
mach64_wait_fifo_idle(mach64);
READ8(addr, mach64->host_cntl);
break;
case 0x280: case 0x281: case 0x282: case 0x283:
mach64_wait_fifo_idle(mach64);
READ8(addr, mach64->pat_reg0);