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

Corrected Voodoo 2 blitter source/dest tiled bits

Browse source 
Chroma test now applied during screen-to-screen blits
Fixes 2D flickering in Star Trek Starfleet Academy
This commit is contained in:
SarahW 2017-02-06 21:24:16 +00:00
commit 04c454401f
1 changed files with 28 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

30
src/vid_voodoo.c
View file

@ -964,8 +964,8 @@ enum
enum enum
{ {
BLTCMD_SRC_TILED = (1 << 10), BLTCMD_SRC_TILED = (1 << 14),
BLTCMD_DST_TILED = (1 << 12) BLTCMD_DST_TILED = (1 << 15)
}; };
#define TEXTUREMODE_MASK 0x3ffff000 #define TEXTUREMODE_MASK 0x3ffff000
@ -3771,6 +3771,7 @@ static void blit_start(voodoo_t *voodoo)
{ {
uint16_t src_dat = src[src_x]; uint16_t src_dat = src[src_x];
uint16_t dst_dat = dst[dst_x]; uint16_t dst_dat = dst[dst_x];
int rop = 0;
if (voodoo->bltCommand & BLIT_CLIPPING_ENABLED) if (voodoo->bltCommand & BLIT_CLIPPING_ENABLED)
{ {
@ -3779,7 +3780,30 @@ static void blit_start(voodoo_t *voodoo)
goto skip_pixel_blit; goto skip_pixel_blit;
} }
MIX(src_dat, dst_dat, voodoo->bltRop[3]); if (voodoo->bltCommand & BLIT_SRC_CHROMA)
{
int r = (src_dat >> 11);
int g = (src_dat >> 5) & 0x3f;
int b = src_dat & 0x1f;
if (r >= voodoo->bltSrcChromaMinR && r <= voodoo->bltSrcChromaMaxR &&
g >= voodoo->bltSrcChromaMinG && g <= voodoo->bltSrcChromaMaxG &&
b >= voodoo->bltSrcChromaMinB && b <= voodoo->bltSrcChromaMaxB)
rop |= BLIT_ROP_SRC_PASS;
}
if (voodoo->bltCommand & BLIT_DST_CHROMA)
{
int r = (dst_dat >> 11);
int g = (dst_dat >> 5) & 0x3f;
int b = dst_dat & 0x1f;
if (r >= voodoo->bltDstChromaMinR && r <= voodoo->bltDstChromaMaxR &&
g >= voodoo->bltDstChromaMinG && g <= voodoo->bltDstChromaMaxG &&
b >= voodoo->bltDstChromaMinB && b <= voodoo->bltDstChromaMaxB)
rop |= BLIT_ROP_DST_PASS;
}
MIX(src_dat, dst_dat, voodoo->bltRop[rop]);
dst[dst_x] = dst_dat; dst[dst_x] = dst_dat;
skip_pixel_blit: skip_pixel_blit: