mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-04-28 23:38:49 +00:00
Fix incorrect clamping in SWRenderer.
A previous PR changed a whole lot of min/maxes to std::min/std::max but made a mistake here and used a templated min which cast it's arguments to unsigned instead of casting return value. This resulted in glitchy artifacts in bright areas (See issue 7439) I rewrote the code to use a proper clamping function so it's cleaner to read.
This commit is contained in:
parent
3ac4e9f171
commit
b8695a57da
3 changed files with 20 additions and 20 deletions
|
@ -8,24 +8,16 @@
|
|||
|
||||
#include "Common/MathUtil.h"
|
||||
|
||||
template <typename T>
|
||||
T ClampAndReturn(const T& val, const T& min, const T& max)
|
||||
{
|
||||
T ret = val;
|
||||
MathUtil::Clamp(&ret, min, max);
|
||||
return ret;
|
||||
}
|
||||
|
||||
TEST(MathUtil, Clamp)
|
||||
{
|
||||
EXPECT_EQ(1, ClampAndReturn(1, 0, 2));
|
||||
EXPECT_EQ(1.0, ClampAndReturn(1.0, 0.0, 2.0));
|
||||
EXPECT_EQ(1, MathUtil::Clamp(1, 0, 2));
|
||||
EXPECT_EQ(1.0, MathUtil::Clamp(1.0, 0.0, 2.0));
|
||||
|
||||
EXPECT_EQ(2, ClampAndReturn(4, 0, 2));
|
||||
EXPECT_EQ(2.0, ClampAndReturn(4.0, 0.0, 2.0));
|
||||
EXPECT_EQ(2, MathUtil::Clamp(4, 0, 2));
|
||||
EXPECT_EQ(2.0, MathUtil::Clamp(4.0, 0.0, 2.0));
|
||||
|
||||
EXPECT_EQ(0, ClampAndReturn(-1, 0, 2));
|
||||
EXPECT_EQ(0.0, ClampAndReturn(-1.0, 0.0, 2.0));
|
||||
EXPECT_EQ(0, MathUtil::Clamp(-1, 0, 2));
|
||||
EXPECT_EQ(0.0, MathUtil::Clamp(-1.0, 0.0, 2.0));
|
||||
}
|
||||
|
||||
TEST(MathUtil, IsINF)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue