From efa55998b484d86d80569b077758df2210973df1 Mon Sep 17 00:00:00 2001 From: ted green Date: Mon, 8 Jun 2015 07:33:34 -0600 Subject: [PATCH] More fixes for 32 bit --- src/emu/video/rgbsse.h | 2 +- src/emu/video/vooddefs.h | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/emu/video/rgbsse.h b/src/emu/video/rgbsse.h index b2b677a7eba..88a345f316c 100644 --- a/src/emu/video/rgbsse.h +++ b/src/emu/video/rgbsse.h @@ -315,7 +315,7 @@ INLINE void rgbint_scale_channel_and_clamp(rgbint *color, const rgbint *colorsca *color = _mm_min_epi16(*color, *(__m128i *)&rgbsse_statics.maxbyte); } -INLINE void rgbint_scale_immediate_add_and_clamp(rgbint *color1, INT16 colorscale, const rgbaint *color2) +INLINE void rgbaint_scale_immediate_add_and_clamp(rgbaint *color1, INT16 colorscale, const rgbaint *color2) { // color2 will get mutiplied by 2^8 (256) and then divided by 2^8 by the shift by 8 __m128i mscale = _mm_unpacklo_epi16(_mm_set1_epi16(colorscale), _mm_set_epi16(0, 0, 0, 0, 256, 256, 256, 256)); diff --git a/src/emu/video/vooddefs.h b/src/emu/video/vooddefs.h index 8e76cdd1c3a..bc346133cfe 100644 --- a/src/emu/video/vooddefs.h +++ b/src/emu/video/vooddefs.h @@ -3216,7 +3216,7 @@ ATTR_FORCE_INLINE void applyFogging(voodoo_state *v, UINT32 fogModeReg, UINT32 f /* if fog_mult is 0, we add this to the original color */ if (FOGMODE_FOG_MULT(fogModeReg) == 0) { - rgbint_scale_immediate_add_and_clamp(&tmpA, fogblend, &tmpB); + rgbaint_scale_immediate_add_and_clamp(&tmpA, fogblend, &tmpB); //color += fog; //(RR) += fr; //(GG) += fg; @@ -4315,7 +4315,7 @@ ATTR_FORCE_INLINE bool combineColor(voodoo_state *VV, stats_block *STATS, UINT32 sub_val.u &= 0x00ffffff; rgba_to_rgbaint(&tmpB, (rgb_t) sub_val.u); - rgbint_sub(&tmpA, &tmpB); + rgbaint_sub(&tmpA, &tmpB); } /* blend RGB */ @@ -4847,7 +4847,7 @@ ATTR_FORCE_INLINE UINT32 combineTexture(tmu_state *TT, const UINT32 TEXMODE, rgb sub_val.u &= 0x00ffffff; rgba_to_rgbaint(&tmpB, (rgb_t) sub_val.u); - rgbint_sub(&tmpA, &tmpB); + rgbaint_sub(&tmpA, &tmpB); } /* blend RGB */