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

Implemented Voodoo performance counters.

Browse source
This commit is contained in:
TomW 2015-09-13 12:10:44 +01:00
commit 77cc248147
1 changed files with 76 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

76
src/vid_voodoo.c
View file

@ -266,6 +266,12 @@ typedef struct voodoo_t
int scrfilter; int scrfilter;
uint32_t last_write_addr; uint32_t last_write_addr;
uint32_t fbiPixelsIn;
uint32_t fbiChromaFail;
uint32_t fbiZFuncFail;
uint32_t fbiAFuncFail;
uint32_t fbiPixelsOut;
rgb_t clutData[33]; rgb_t clutData[33];
int clutData_dirty; int clutData_dirty;
@ -381,6 +387,12 @@ enum
SST_color0 = 0x144, SST_color0 = 0x144,
SST_color1 = 0x148, SST_color1 = 0x148,
SST_fbiPixelsIn = 0x14c,
SST_fbiChromaFail = 0x150,
SST_fbiZFuncFail = 0x154,
SST_fbiAFuncFail = 0x158,
SST_fbiPixelsOut = 0x15c,
SST_fogTable00 = 0x160, SST_fogTable00 = 0x160,
SST_fogTable01 = 0x164, SST_fogTable01 = 0x164,
SST_fogTable02 = 0x168, SST_fogTable02 = 0x168,
@ -1368,30 +1380,49 @@ static inline void voodoo_get_texture(voodoo_t *voodoo, voodoo_params_t *params,
switch (depth_op) \ switch (depth_op) \
{ \ { \
case DEPTHOP_NEVER: \ case DEPTHOP_NEVER: \
voodoo->fbiZFuncFail++; \
goto skip_pixel; \ goto skip_pixel; \
case DEPTHOP_LESSTHAN: \ case DEPTHOP_LESSTHAN: \
if (!(new_depth < old_depth)) \ if (!(new_depth < old_depth)) \
{ \
voodoo->fbiZFuncFail++; \
goto skip_pixel; \ goto skip_pixel; \
} \
break; \ break; \
case DEPTHOP_EQUAL: \ case DEPTHOP_EQUAL: \
if (!(new_depth == old_depth)) \ if (!(new_depth == old_depth)) \
{ \
voodoo->fbiZFuncFail++; \
goto skip_pixel; \ goto skip_pixel; \
} \
break; \ break; \
case DEPTHOP_LESSTHANEQUAL: \ case DEPTHOP_LESSTHANEQUAL: \
if (!(new_depth <= old_depth)) \ if (!(new_depth <= old_depth)) \
{ \
voodoo->fbiZFuncFail++; \
goto skip_pixel; \ goto skip_pixel; \
} \
break; \ break; \
case DEPTHOP_GREATERTHAN: \ case DEPTHOP_GREATERTHAN: \
if (!(new_depth > old_depth)) \ if (!(new_depth > old_depth)) \
{ \
voodoo->fbiZFuncFail++; \
goto skip_pixel; \ goto skip_pixel; \
} \
break; \ break; \
case DEPTHOP_NOTEQUAL: \ case DEPTHOP_NOTEQUAL: \
if (!(new_depth != old_depth)) \ if (!(new_depth != old_depth)) \
{ \
voodoo->fbiZFuncFail++; \
goto skip_pixel; \ goto skip_pixel; \
} \
break; \ break; \
case DEPTHOP_GREATERTHANEQUAL: \ case DEPTHOP_GREATERTHANEQUAL: \
if (!(new_depth >= old_depth)) \ if (!(new_depth >= old_depth)) \
{ \
voodoo->fbiZFuncFail++; \
goto skip_pixel; \ goto skip_pixel; \
} \
break; \ break; \
case DEPTHOP_ALWAYS: \ case DEPTHOP_ALWAYS: \
break; \ break; \
@ -1469,30 +1500,49 @@ static inline void voodoo_get_texture(voodoo_t *voodoo, voodoo_params_t *params,
switch (alpha_func) \ switch (alpha_func) \
{ \ { \
case AFUNC_NEVER: \ case AFUNC_NEVER: \
voodoo->fbiAFuncFail++; \
goto skip_pixel; \ goto skip_pixel; \
case AFUNC_LESSTHAN: \ case AFUNC_LESSTHAN: \
if (!(src_a < a_ref)) \ if (!(src_a < a_ref)) \
{ \
voodoo->fbiAFuncFail++; \
goto skip_pixel; \ goto skip_pixel; \
} \
break; \ break; \
case AFUNC_EQUAL: \ case AFUNC_EQUAL: \
if (!(src_a == a_ref)) \ if (!(src_a == a_ref)) \
{ \
voodoo->fbiAFuncFail++; \
goto skip_pixel; \ goto skip_pixel; \
} \
break; \ break; \
case AFUNC_LESSTHANEQUAL: \ case AFUNC_LESSTHANEQUAL: \
if (!(src_a <= a_ref)) \ if (!(src_a <= a_ref)) \
{ \
voodoo->fbiAFuncFail++; \
goto skip_pixel; \ goto skip_pixel; \
} \
break; \ break; \
case AFUNC_GREATERTHAN: \ case AFUNC_GREATERTHAN: \
if (!(src_a > a_ref)) \ if (!(src_a > a_ref)) \
{ \
voodoo->fbiAFuncFail++; \
goto skip_pixel; \ goto skip_pixel; \
} \
break; \ break; \
case AFUNC_NOTEQUAL: \ case AFUNC_NOTEQUAL: \
if (!(src_a != a_ref)) \ if (!(src_a != a_ref)) \
{ \
voodoo->fbiAFuncFail++; \
goto skip_pixel; \ goto skip_pixel; \
} \
break; \ break; \
case AFUNC_GREATERTHANEQUAL: \ case AFUNC_GREATERTHANEQUAL: \
if (!(src_a >= a_ref)) \ if (!(src_a >= a_ref)) \
{ \
voodoo->fbiAFuncFail++; \
goto skip_pixel; \ goto skip_pixel; \
} \
break; \ break; \
case AFUNC_ALWAYS: \ case AFUNC_ALWAYS: \
break; \ break; \
@ -1822,6 +1872,7 @@ static void voodoo_half_triangle(voodoo_t *voodoo, voodoo_params_t *params, vood
{ {
start_x = x; start_x = x;
voodoo->pixel_count[odd_even]++; voodoo->pixel_count[odd_even]++;
voodoo->fbiPixelsIn++;
if (voodoo_output) if (voodoo_output)
pclog(" X=%03i T=%08x\n", x, tmu0_t); pclog(" X=%03i T=%08x\n", x, tmu0_t);
// if (voodoo->fbzMode & FBZ_RGB_WMASK) // if (voodoo->fbzMode & FBZ_RGB_WMASK)
@ -1903,7 +1954,10 @@ static void voodoo_half_triangle(voodoo_t *voodoo, voodoo_params_t *params, vood
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++;
goto skip_pixel; goto skip_pixel;
}
if (voodoo->trexInit1 & (1 << 18)) if (voodoo->trexInit1 & (1 << 18))
{ {
@ -2167,6 +2221,7 @@ static void voodoo_half_triangle(voodoo_t *voodoo, voodoo_params_t *params, vood
} }
} }
voodoo_output &= ~2; voodoo_output &= ~2;
voodoo->fbiPixelsOut++;
skip_pixel: skip_pixel:
if (state->xdir > 0) if (state->xdir > 0)
{ {
@ -2887,6 +2942,11 @@ static void voodoo_reg_writel(uint32_t addr, uint32_t val, void *p)
case SST_nopCMD: case SST_nopCMD:
voodoo->cmd_read++; voodoo->cmd_read++;
voodoo->fbiPixelsIn = 0;
voodoo->fbiChromaFail = 0;
voodoo->fbiZFuncFail = 0;
voodoo->fbiAFuncFail = 0;
voodoo->fbiPixelsOut = 0;
break; break;
case SST_fastfillCMD: case SST_fastfillCMD:
wait_for_render_thread_idle(voodoo); wait_for_render_thread_idle(voodoo);
@ -3582,6 +3642,22 @@ static uint32_t voodoo_readl(uint32_t addr, void *p)
temp = voodoo->lfbMode; temp = voodoo->lfbMode;
break; break;
case SST_fbiPixelsIn:
temp = voodoo->fbiPixelsIn & 0xffffff;
break;
case SST_fbiChromaFail:
temp = voodoo->fbiChromaFail & 0xffffff;
break;
case SST_fbiZFuncFail:
temp = voodoo->fbiZFuncFail & 0xffffff;
break;
case SST_fbiAFuncFail:
temp = voodoo->fbiAFuncFail & 0xffffff;
break;
case SST_fbiPixelsOut:
temp = voodoo->fbiPixelsOut & 0xffffff;
break;
case SST_fbiInit4: case SST_fbiInit4:
temp = voodoo->fbiInit4; temp = voodoo->fbiInit4;
break; break;