Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-10-05 00:38:58 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

- Credit to SGINut, not MooglyGuy or Ryan Holtz

Browse Source 
- Move texture masking to occur after coordinate adjustment
- Fix 32-bit texturing in load_tile (Mario Kart 64 title screen)
- Add zero-alpha early-out (Mario 64 trees/stars, Mario Kart 64 trees/karts)
This commit is contained in:
Ryan Holtz 2008-01-06 09:19:32 +00:00
parent 943026c09b
commit 2912b80454
1 changed files with 113 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

191
src/mame/video/n64.c
View File

@ -230,6 +230,20 @@ static RECTANGLE clip;
static UINT8 *texture_cache; static UINT8 *texture_cache;
static UINT32 tlut[256]; static UINT32 tlut[256];
#define MASK(S, T) \
do \
{ \
if (mask_s != 0) \
{ \
S &= (((UINT32)(0xffffffff) >> (32-mask_s))); \
} \
if (mask_t != 0) \
{ \
T &= (((UINT32)(0xffffffff) >> (32-mask_t))); \
} \
} \
while (0)
#define CLAMP(S, T) \ #define CLAMP(S, T) \
do \ do \
{ \ { \
@ -243,10 +257,6 @@ do \
if (S < (tsl >> 2)) S = abs(S - (tsl >> 2)); \ if (S < (tsl >> 2)) S = abs(S - (tsl >> 2)); \
if (S > (tsh >> 2)) S = abs(S - (tsh >> 2)); \ if (S > (tsh >> 2)) S = abs(S - (tsh >> 2)); \
} \ } \
if (mask_s != 0) \
{ \
S &= (((UINT32)(0xffffffff) >> (32-mask_s))); \
} \
if (clamp_t) \ if (clamp_t) \
{ \ { \
if (T < (ttl >> 2)) T = (ttl >> 2); \ if (T < (ttl >> 2)) T = (ttl >> 2); \
@ -257,10 +267,6 @@ do \
if (T < (ttl >> 2)) T = abs(T - (ttl >> 2)); \ if (T < (ttl >> 2)) T = abs(T - (ttl >> 2)); \
if (T > (tth >> 2)) T = abs(T - (tth >> 2)); \ if (T > (tth >> 2)) T = abs(T - (tth >> 2)); \
} \ } \
if (mask_t != 0) \
{ \
T &= (((UINT32)(0xffffffff) >> (32-mask_t))); \
} \
} \ } \
while (0) while (0)
@ -832,7 +838,7 @@ INLINE void FETCH_TEXEL(COLOR *color, int s, int t, UINT32 twidth, UINT32 tforma
case PIXEL_SIZE_32BIT: case PIXEL_SIZE_32BIT:
{ {
UINT32 *tc = (UINT32*)texture_cache; UINT32 *tc = (UINT32*)texture_cache;
int taddr = ((tbase/4) + ((t) * (twidth/2)) + (s)) ^ ((t & 1) ? XOR_SWAP_DWORD : 0); int taddr = ((tbase/4) + ((t) * (twidth/2)) + (s)) ^ ((t & 1) ? XOR_SWAP_DWORD : 0);
UINT32 c = tc[taddr]; UINT32 c = tc[taddr];
color->r = ((c >> 24) & 0xff); color->r = ((c >> 24) & 0xff);
@ -1026,6 +1032,9 @@ do \
sst1 -= ttl >> 2; \ sst1 -= ttl >> 2; \
sst2 -= ttl >> 2; \ sst2 -= ttl >> 2; \
\ \
MASK(sss1, sst1); \
MASK(sss2, sst2); \
\
FETCH_TEXEL(&t0, sss1, sst1, twidth, tformat, tsize, tbase); \ FETCH_TEXEL(&t0, sss1, sst1, twidth, tformat, tsize, tbase); \
FETCH_TEXEL(&t1, sss2, sst1, twidth, tformat, tsize, tbase); \ FETCH_TEXEL(&t1, sss2, sst1, twidth, tformat, tsize, tbase); \
FETCH_TEXEL(&t2, sss1, sst2, twidth, tformat, tsize, tbase); \ FETCH_TEXEL(&t2, sss1, sst2, twidth, tformat, tsize, tbase); \
@ -1057,6 +1066,8 @@ do \
sss1 -= tsl >> 2; \ sss1 -= tsl >> 2; \
sst1 -= ttl >> 2; \ sst1 -= ttl >> 2; \
\ \
MASK(sss1, sst1); \
\
/* point sample */ \ /* point sample */ \
FETCH_TEXEL(&TEX, sss1, sst1, twidth, tformat, tsize, tbase); \ FETCH_TEXEL(&TEX, sss1, sst1, twidth, tformat, tsize, tbase); \
} \ } \
@ -1821,6 +1832,7 @@ static void render_spans_32(int start, int end, int tilenum, int shade, int text
if (x >= clipx1 && x < clipx2) if (x >= clipx1 && x < clipx2)
{ {
int alpha_out = 0;
COLOR c1, c2; COLOR c1, c2;
c1.r = c1.g = c1.b = c1.a = 0; c1.r = c1.g = c1.b = c1.a = 0;
c2.r = c2.g = c2.b = c2.a = 0; c2.r = c2.g = c2.b = c2.a = 0;
@ -1905,44 +1917,55 @@ static void render_spans_32(int start, int end, int tilenum, int shade, int text
if (other_modes.cycle_type == CYCLE_TYPE_1) if (other_modes.cycle_type == CYCLE_TYPE_1)
{ {
c1 = COLOR_COMBINER(0); c1 = COLOR_COMBINER(0);
if( c1.a == 0 )
{
alpha_out = 1;
}
} }
else if (other_modes.cycle_type == CYCLE_TYPE_2) else if (other_modes.cycle_type == CYCLE_TYPE_2)
{ {
c1 = COLOR_COMBINER(0); c1 = COLOR_COMBINER(0);
c2 = COLOR_COMBINER(1); c2 = COLOR_COMBINER(1);
if( c2.a == 0 )
{
alpha_out = 1;
}
} }
oz = (UINT16)zb[(fb_index + x) ^ WORD_ADDR_XOR]; if( !alpha_out )
if (zbuffer) {
{ oz = (UINT16)zb[(fb_index + x) ^ WORD_ADDR_XOR];
if (sz < oz /*&& c.a != 0*/) if (zbuffer)
{ {
if (other_modes.cycle_type == CYCLE_TYPE_1) if (sz < oz /*&& c.a != 0*/)
{ {
BLENDER1_32(&fb[(fb_index + x)], c1); if (other_modes.cycle_type == CYCLE_TYPE_1)
} {
else BLENDER1_32(&fb[(fb_index + x)], c1);
{ }
BLENDER2_32(&fb[(fb_index + x)], c1, c2); else
} {
BLENDER2_32(&fb[(fb_index + x)], c1, c2);
}
if (other_modes.z_compare_en && other_modes.z_update_en) if (other_modes.z_compare_en && other_modes.z_update_en)
{ {
zb[(fb_index + x) ^ WORD_ADDR_XOR] = sz; zb[(fb_index + x) ^ WORD_ADDR_XOR] = sz;
} }
} }
} }
else else
{ {
if (other_modes.cycle_type == CYCLE_TYPE_1) if (other_modes.cycle_type == CYCLE_TYPE_1)
{ {
BLENDER1_32(&fb[(fb_index + x)], c1); BLENDER1_32(&fb[(fb_index + x)], c1);
} }
else else
{ {
BLENDER2_32(&fb[(fb_index + x)], c1, c2); BLENDER2_32(&fb[(fb_index + x)], c1, c2);
} }
} }
}
} }
r += drinc; r += drinc;
@ -2110,6 +2133,7 @@ static void render_spans_16(int start, int end, int tilenum, int shade, int text
UINT16 sz = z >> 16; UINT16 sz = z >> 16;
int oz; int oz;
int sss = 0, sst = 0; int sss = 0, sst = 0;
int alpha_out = 0;
COLOR c1, c2; COLOR c1, c2;
c1.r = c1.g = c1.b = c1.a = 0; c1.r = c1.g = c1.b = c1.a = 0;
c2.r = c2.g = c2.b = c2.a = 0; c2.r = c2.g = c2.b = c2.a = 0;
@ -2196,53 +2220,64 @@ static void render_spans_16(int start, int end, int tilenum, int shade, int text
if (other_modes.cycle_type == CYCLE_TYPE_1) if (other_modes.cycle_type == CYCLE_TYPE_1)
{ {
c1 = COLOR_COMBINER(0); c1 = COLOR_COMBINER(0);
if( c1.a == 0 )
{
alpha_out = 1;
}
} }
else if (other_modes.cycle_type == CYCLE_TYPE_2) else if (other_modes.cycle_type == CYCLE_TYPE_2)
{ {
c1 = COLOR_COMBINER(0); c1 = COLOR_COMBINER(0);
c2 = COLOR_COMBINER(1); c2 = COLOR_COMBINER(1);
if( c2.a == 0 )
{
alpha_out = 1;
}
} }
oz = (UINT16)zb[(fb_index + x) ^ WORD_ADDR_XOR]; if( !alpha_out )
if (zbuffer) {
{ oz = (UINT16)zb[(fb_index + x) ^ WORD_ADDR_XOR];
if (sz < oz /*&& c.a != 0*/) if (zbuffer)
{ {
//BLENDER1_16(&fb[(fb_index + x) ^ WORD_ADDR_XOR], c); if (sz < oz /*&& c.a != 0*/)
{ {
int dith = dither_matrix_4x4[(((j) & 3) << 2) + ((i^WORD_ADDR_XOR) & 3)]; //BLENDER1_16(&fb[(fb_index + x) ^ WORD_ADDR_XOR], c);
if (other_modes.cycle_type == CYCLE_TYPE_1) {
{ int dith = dither_matrix_4x4[(((j) & 3) << 2) + ((i^WORD_ADDR_XOR) & 3)];
BLENDER1_16(&fb[(fb_index + x) ^ WORD_ADDR_XOR], c1, dith); if (other_modes.cycle_type == CYCLE_TYPE_1)
} {
else BLENDER1_16(&fb[(fb_index + x) ^ WORD_ADDR_XOR], c1, dith);
{ }
BLENDER2_16(&fb[(fb_index + x) ^ WORD_ADDR_XOR], c1, c2, dith); else
} {
} BLENDER2_16(&fb[(fb_index + x) ^ WORD_ADDR_XOR], c1, c2, dith);
}
}
if (other_modes.z_compare_en && other_modes.z_update_en) if (other_modes.z_compare_en && other_modes.z_update_en)
{ {
zb[(fb_index + x) ^ WORD_ADDR_XOR] = sz; zb[(fb_index + x) ^ WORD_ADDR_XOR] = sz;
} }
} }
} }
else else
{ {
//BLENDER1_16(&fb[(fb_index + x) ^ WORD_ADDR_XOR], c); //BLENDER1_16(&fb[(fb_index + x) ^ WORD_ADDR_XOR], c);
{ {
int dith = dither_matrix_4x4[(((j) & 3) << 2) + ((i^WORD_ADDR_XOR) & 3)]; int dith = dither_matrix_4x4[(((j) & 3) << 2) + ((i^WORD_ADDR_XOR) & 3)];
if (other_modes.cycle_type == CYCLE_TYPE_1) if (other_modes.cycle_type == CYCLE_TYPE_1)
{ {
BLENDER1_16(&fb[(fb_index + x) ^ WORD_ADDR_XOR], c1, dith); BLENDER1_16(&fb[(fb_index + x) ^ WORD_ADDR_XOR], c1, dith);
} }
else else
{ {
BLENDER2_16(&fb[(fb_index + x) ^ WORD_ADDR_XOR], c1, c2, dith); BLENDER2_16(&fb[(fb_index + x) ^ WORD_ADDR_XOR], c1, c2, dith);
} }
} }
} }
}
} }
r += drinc; r += drinc;
@ -3245,7 +3280,7 @@ static void rdp_load_tile(UINT32 w1, UINT32 w2)
for (j=0; j < height; j++) for (j=0; j < height; j++)
{ {
int tline = tb + ((tile[tilenum].line / 4) * j); int tline = tb + ((tile[tilenum].line / 2) * j);
int s = ((j + tl) * ti_width) + sl; int s = ((j + tl) * ti_width) + sl;
for (i=0; i < width; i++) for (i=0; i < width; i++)