Diamond75/Panda3DS
1
0
Fork 0
mirror of https://github.com/wheremyfoodat/Panda3DS.git synced 2025-04-19 20:19:13 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix shader-interpreter MIN/MAX output

Browse source 
Takes advantage of min/max's properties regarding non-finites to return
NaN depending on its input position:
```
max(NaN, 2.f) -> NaN
max(2.f, NaN) -> 2
min(NaN, 2.f) -> NaN
min(2.f, NaN) -> 2
```
This commit is contained in:
Wunkolo 2024-03-11 18:58:41 -07:00
parent 123252592b
commit 9959fd88b5
No known key found for this signature in database
1 changed files with 12 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/core/PICA/shader_interpreter.cpp
View file

@ -244,8 +244,12 @@ void PICAShader::max(u32 instruction) {
u32 componentMask = operandDescriptor & 0xf;
for (int i = 0; i < 4; i++) {
if (componentMask & (1 << i)) {
const auto maximum = srcVec1[3 - i] > srcVec2[3 - i] ? srcVec1[3 - i] : srcVec2[3 - i];
destVector[3 - i] = maximum;
const float inputA = srcVec1[3 - i].toFloat32();
const float inputB = srcVec2[3 - i].toFloat32();
// max(NaN, 2.f) -> NaN
// max(2.f, NaN) -> 2
const auto& maximum = std::isinf(inputB) ? inputB : std::max(inputB, inputA);
destVector[3 - i] = f24::fromFloat32(maximum);
}
}
}
@ -266,8 +270,12 @@ void PICAShader::min(u32 instruction) {
u32 componentMask = operandDescriptor & 0xf;
for (int i = 0; i < 4; i++) {
if (componentMask & (1 << i)) {
const auto mininum = srcVec1[3 - i] < srcVec2[3 - i] ? srcVec1[3 - i] : srcVec2[3 - i];
destVector[3 - i] = mininum;
const float inputA = srcVec1[3 - i].toFloat32();
const float inputB = srcVec2[3 - i].toFloat32();
// min(NaN, 2.f) -> NaN
// min(2.f, NaN) -> 2
const auto& mininum = std::min(inputB, inputA);
destVector[3 - i] = f24::fromFloat32(mininum);
}
}
}