diff options
Diffstat (limited to 'src/devices/video/vooddefs.h')
-rw-r--r-- | src/devices/video/vooddefs.h | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/devices/video/vooddefs.h b/src/devices/video/vooddefs.h index 3725b281ac8..3ac63b27c61 100644 --- a/src/devices/video/vooddefs.h +++ b/src/devices/video/vooddefs.h @@ -2044,15 +2044,8 @@ inline bool ATTR_FORCE_INLINE voodoo_device::depthTest(uint16_t zaColorReg, stat return true; } -#define PIXEL_PIPELINE_END(vd, STATS, DITHER, DITHER4, DITHER_LOOKUP, XX, dest, depth, FBZMODE, FBZCOLORPATH, ALPHAMODE, FOGMODE, ITERZ, ITERW, ITERAXXX, wfloat) \ - \ - /* perform fogging */ \ - preFog.set(color); \ - if (FOGMODE_ENABLE_FOG(FOGMODE)) \ - applyFogging(vd, FBZMODE, FOGMODE, FBZCOLORPATH, XX, DITHER4, wfloat, color, ITERZ, ITERW, ITERAXXX); \ - /* perform alpha blending */ \ - if (ALPHAMODE_ALPHABLEND(ALPHAMODE)) \ - alphaBlend(FBZMODE, ALPHAMODE, XX, DITHER, dest[XX], depth, preFog, color, vd->fbi.rgb565); \ +#define PIXEL_PIPELINE_END(STATS, DITHER_LOOKUP, XX, dest, depth, FBZMODE) \ + \ r = color.get_r(); g = color.get_g(); b = color.get_b(); \ /* modify the pixel for debugging purposes */ \ MODIFY_PIXEL(VV); \ @@ -2769,10 +2762,17 @@ void voodoo_device::raster_##name(void *destbase, int32_t y, const poly_extent * if (!combineColor(vd, stats, FBZCOLORPATH, FBZMODE, ALPHAMODE, texel, iterz, iterw, color)) \ goto skipdrawdepth; \ \ - /* pixel pipeline part 2 handles fog, alpha, and final output */ \ - PIXEL_PIPELINE_END(vd, stats, dither, dither4, dither_lookup, x, dest, depth, \ - FBZMODE, FBZCOLORPATH, ALPHAMODE, FOGMODE, \ - iterz, iterw, iterargb, wfloat); \ + /* perform fogging */ \ + preFog.set(color); \ + if (FOGMODE_ENABLE_FOG(FOGMODE)) \ + applyFogging(vd, FBZMODE, FOGMODE, FBZCOLORPATH, x, dither4, wfloat, color, iterz, iterw, iterargb); \ + \ + /* perform alpha blending */ \ + if (ALPHAMODE_ALPHABLEND(ALPHAMODE)) \ + alphaBlend(FBZMODE, ALPHAMODE, x, dither, dest[x], depth, preFog, color, vd->fbi.rgb565); \ + \ + /* pixel pipeline part 2 handles final output */ \ + PIXEL_PIPELINE_END(stats, dither_lookup, x, dest, depth, FBZMODE); \ \ /* update the iterated parameters */ \ iterargb += iterargbDelta; \ |