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

Voodoo texture processing now dependent on texturing being enabled in fbzColorPath. Fixes transparency issues in Tomb Raider, might cause speedup in games that use non-textured triangles.

Browse source
This commit is contained in:
TomW 2015-10-04 11:33:13 +01:00
commit 5e08d53c73
1 changed files with 37 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

62
src/vid_voodoo.c
View file

@ -754,6 +754,11 @@ enum
CMD_SWAPBUF CMD_SWAPBUF
}; };
enum
{
FBZCP_TEXTURE_ENABLED = (1 << 27)
};
static void voodoo_update_ncc(voodoo_t *voodoo) static void voodoo_update_ncc(voodoo_t *voodoo)
{ {
int tbl; int tbl;
@ -1924,39 +1929,42 @@ static void voodoo_half_triangle(voodoo_t *voodoo, voodoo_params_t *params, vood
dest_b |= (dest_b >> 5); dest_b |= (dest_b >> 5);
dest_a = 0xff; dest_a = 0xff;
if (params->textureMode & 1) if (params->fbzColorPath & FBZCP_TEXTURE_ENABLED)
{ {
int64_t _w = 0; if (params->textureMode & 1)
if (tmu0_w) {
_w = (int64_t)((1ULL << 48) / tmu0_w); int64_t _w = 0;
if (tmu0_w)
_w = (int64_t)((1ULL << 48) / tmu0_w);
state->tex_s = (int32_t)(((tmu0_s >> 14) * _w) >> 30); state->tex_s = (int32_t)(((tmu0_s >> 14) * _w) >> 30);
state->tex_t = (int32_t)(((tmu0_t >> 14) * _w) >> 30); state->tex_t = (int32_t)(((tmu0_t >> 14) * _w) >> 30);
// state->lod = state->tmu[0].lod + (int)(log2((double)_w / (double)(1 << 19)) * 256.0); // state->lod = state->tmu[0].lod + (int)(log2((double)_w / (double)(1 << 19)) * 256.0);
state->lod = state->tmu[0].lod + (fastlog(_w) - (19 << 8)); state->lod = state->tmu[0].lod + (fastlog(_w) - (19 << 8));
} }
else else
{ {
state->tex_s = (int32_t)(tmu0_s >> (14+14)); state->tex_s = (int32_t)(tmu0_s >> (14+14));
state->tex_t = (int32_t)(tmu0_t >> (14+14)); state->tex_t = (int32_t)(tmu0_t >> (14+14));
state->lod = state->tmu[0].lod; state->lod = state->tmu[0].lod;
} }
if (state->lod < state->lod_min) if (state->lod < state->lod_min)
state->lod = state->lod_min; state->lod = state->lod_min;
else if (state->lod > state->lod_max) else if (state->lod > state->lod_max)
state->lod = state->lod_max; state->lod = state->lod_max;
state->lod >>= 8; state->lod >>= 8;
voodoo_get_texture(voodoo, params, state); voodoo_get_texture(voodoo, params, state);
if ((params->fbzMode & FBZ_CHROMAKEY) && if ((params->fbzMode & FBZ_CHROMAKEY) &&
state->tex_r == params->chromaKey_r && state->tex_r == params->chromaKey_r &&
state->tex_g == params->chromaKey_g && state->tex_g == params->chromaKey_g &&
state->tex_b == params->chromaKey_b) state->tex_b == params->chromaKey_b)
{ {
voodoo->fbiChromaFail++; voodoo->fbiChromaFail++;
goto skip_pixel; goto skip_pixel;
}
} }
if (voodoo->trexInit1 & (1 << 18)) if (voodoo->trexInit1 & (1 << 18))