Software renderer: Properly calculate tev combiner output.

As pointed out by dolphin-emu/hwtests@461476112.
This commit is contained in:
Tony Wasserka 2014-03-24 14:54:17 +01:00
parent a8c8db8da7
commit 1dead05cae
1 changed files with 8 additions and 6 deletions

View File

@ -185,10 +185,11 @@ void Tev::DrawColorRegular(TevStageCombiner::ColorCombiner &cc, const InputRegTy
u16 c = InputReg.c + (InputReg.c >> 7); u16 c = InputReg.c + (InputReg.c >> 7);
s32 temp = InputReg.a * (256 - c) + (InputReg.b * c); s32 temp = InputReg.a * (256 - c) + (InputReg.b * c);
temp = cc.op?(-temp >> 8):(temp >> 8); temp <<= m_ScaleLShiftLUT[cc.shift];
temp += (cc.shift != 3) ? 0 : (cc.op == 1) ? 127 : 128;
temp = cc.op ? (-temp >> 8) : (temp >> 8);
s32 result = InputReg.d + temp + m_BiasLUT[cc.bias]; s32 result = ((InputReg.d + m_BiasLUT[cc.bias]) << m_ScaleLShiftLUT[cc.shift]) + temp;
result = result << m_ScaleLShiftLUT[cc.shift];
result = result >> m_ScaleRShiftLUT[cc.shift]; result = result >> m_ScaleRShiftLUT[cc.shift];
Reg[cc.dest][BLU_C + i] = result; Reg[cc.dest][BLU_C + i] = result;
@ -259,10 +260,11 @@ void Tev::DrawAlphaRegular(TevStageCombiner::AlphaCombiner &ac, const InputRegTy
u16 c = InputReg.c + (InputReg.c >> 7); u16 c = InputReg.c + (InputReg.c >> 7);
s32 temp = InputReg.a * (256 - c) + (InputReg.b * c); s32 temp = InputReg.a * (256 - c) + (InputReg.b * c);
temp = ac.op?(-temp >> 8):(temp >> 8); temp <<= m_ScaleLShiftLUT[ac.shift];
temp += (ac.shift != 3) ? 0 : (ac.op == 1) ? 127 : 128;
temp = ac.op ? (-temp >> 8) : (temp >> 8);
s32 result = InputReg.d + temp + m_BiasLUT[ac.bias]; s32 result = ((InputReg.d + m_BiasLUT[ac.bias]) << m_ScaleLShiftLUT[ac.shift]) + temp;
result = result << m_ScaleLShiftLUT[ac.shift];
result = result >> m_ScaleRShiftLUT[ac.shift]; result = result >> m_ScaleRShiftLUT[ac.shift];
Reg[ac.dest][ALP_C] = result; Reg[ac.dest][ALP_C] = result;