Retro/pcem
Watch
1
0
Fork
You've already forked pcem
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed Mach64 1 bpp source data alignment - fixes font rendering in Windows NT

Browse source
This commit is contained in:
SarahW 2017-01-16 21:29:25 +00:00
commit a94713388b
1 changed files with 32 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

33
src/vid_ati_mach64.c
View file

@ -108,6 +108,8 @@ typedef struct mach64_t
uint32_t gui_traj_cntl; uint32_t gui_traj_cntl;
uint32_t host_cntl;
uint32_t mem_cntl; uint32_t mem_cntl;
uint32_t ovr_clr; uint32_t ovr_clr;
@ -240,6 +242,11 @@ enum
DST_24_ROT_EN = 0x80 DST_24_ROT_EN = 0x80
}; };
enum
{
HOST_BYTE_ALIGN = (1 << 0)
};
void mach64_write(uint32_t addr, uint8_t val, void *priv); void mach64_write(uint32_t addr, uint8_t val, void *priv);
uint8_t mach64_read(uint32_t addr, void *priv); uint8_t mach64_read(uint32_t addr, void *priv);
void mach64_updatemapping(mach64_t *mach64); void mach64_updatemapping(mach64_t *mach64);
@ -638,6 +645,10 @@ static void mach64_accel_write_fifo(mach64_t *mach64, uint32_t addr, uint8_t val
mach64_blit(val, 8, mach64); mach64_blit(val, 8, mach64);
break; break;
case 0x240: case 0x241: case 0x242: case 0x243:
WRITE8(addr, mach64->host_cntl, val);
break;
case 0x280: case 0x281: case 0x282: case 0x283: case 0x280: case 0x281: case 0x282: case 0x283:
WRITE8(addr, mach64->pat_reg0, val); WRITE8(addr, mach64->pat_reg0, val);
break; break;
@ -702,6 +713,10 @@ static void mach64_accel_write_fifo(mach64_t *mach64, uint32_t addr, uint8_t val
break; break;
case 0x333: case 0x333:
WRITE8(addr - 3, mach64->pat_cntl, val & 7); 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; break;
} }
} }
@ -1298,8 +1313,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); mach64->dst_y_x = (mach64->dst_y_x & 0xfff0000) | ((mach64->dst_y_x + (mach64->dst_height_width & 0x1fff)) & 0xfff);
return; return;
} }
if (mach64->accel.source_host) if (mach64->host_cntl & HOST_BYTE_ALIGN)
return; {
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; break;
@ -1731,6 +1755,11 @@ uint8_t mach64_ext_readb(uint32_t addr, void *p)
READ8(addr, mach64->src_cntl); READ8(addr, mach64->src_cntl);
break; 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: case 0x280: case 0x281: case 0x282: case 0x283:
mach64_wait_fifo_idle(mach64); mach64_wait_fifo_idle(mach64);
READ8(addr, mach64->pat_reg0); READ8(addr, mach64->pat_reg0);