Mirror/citra
1
0
Fork 0
mirror of https://github.com/PabloMK7/citra.git synced 2024-11-30 03:10:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

Shaders: Explicitly conform to PICA semantics in MAX/MIN

Browse source
This commit is contained in:
Yuri Kunde Schlesner 2015-08-24 01:46:58 -03:00
parent 76247170df
commit 082b74fa24
2 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/video_core/shader/shader_interpreter.cpp
View file

@ -177,7 +177,10 @@ void RunInterpreter(UnitState<Debug>& state) {
if (!swizzle.DestComponentEnabled(i)) if (!swizzle.DestComponentEnabled(i))
continue; continue;
dest[i] = std::max(src1[i], src2[i]); // NOTE: Exact form required to match NaN semantics to hardware:
// max(0, NaN) -> NaN
// max(NaN, 0) -> 0
dest[i] = (src1[i] > src2[i]) ? src1[i] : src2[i];
} }
Record<DebugDataRecord::DEST_OUT>(state.debug, iteration, dest); Record<DebugDataRecord::DEST_OUT>(state.debug, iteration, dest);
break; break;
@ -190,7 +193,10 @@ void RunInterpreter(UnitState<Debug>& state) {
if (!swizzle.DestComponentEnabled(i)) if (!swizzle.DestComponentEnabled(i))
continue; continue;
dest[i] = std::min(src1[i], src2[i]); // NOTE: Exact form required to match NaN semantics to hardware:
// min(0, NaN) -> NaN
// min(NaN, 0) -> 0
dest[i] = (src1[i] < src2[i]) ? src1[i] : src2[i];
} }
Record<DebugDataRecord::DEST_OUT>(state.debug, iteration, dest); Record<DebugDataRecord::DEST_OUT>(state.debug, iteration, dest);
break; break;

2
src/video_core/shader/shader_jit_x64.cpp
View file

@ -467,6 +467,7 @@ void JitCompiler::Compile_FLR(Instruction instr) {
void JitCompiler::Compile_MAX(Instruction instr) { void JitCompiler::Compile_MAX(Instruction instr) {
Compile_SwizzleSrc(instr, 1, instr.common.src1, SRC1); Compile_SwizzleSrc(instr, 1, instr.common.src1, SRC1);
Compile_SwizzleSrc(instr, 2, instr.common.src2, SRC2); Compile_SwizzleSrc(instr, 2, instr.common.src2, SRC2);
// SSE semantics match PICA200 ones: In case of NaN, SRC2 is returned.
MAXPS(SRC1, R(SRC2)); MAXPS(SRC1, R(SRC2));
Compile_DestEnable(instr, SRC1); Compile_DestEnable(instr, SRC1);
} }
@ -474,6 +475,7 @@ void JitCompiler::Compile_MAX(Instruction instr) {
void JitCompiler::Compile_MIN(Instruction instr) { void JitCompiler::Compile_MIN(Instruction instr) {
Compile_SwizzleSrc(instr, 1, instr.common.src1, SRC1); Compile_SwizzleSrc(instr, 1, instr.common.src1, SRC1);
Compile_SwizzleSrc(instr, 2, instr.common.src2, SRC2); Compile_SwizzleSrc(instr, 2, instr.common.src2, SRC2);
// SSE semantics match PICA200 ones: In case of NaN, SRC2 is returned.
MINPS(SRC1, R(SRC2)); MINPS(SRC1, R(SRC2));
Compile_DestEnable(instr, SRC1); Compile_DestEnable(instr, SRC1);
} }