From b8695a57da067bc1776c8310bb7cd68f5706d320 Mon Sep 17 00:00:00 2001 From: Scott Mansell Date: Tue, 15 Jul 2014 00:42:33 +1200 Subject: 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. --- Source/UnitTests/Common/MathUtilTest.cpp | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) (limited to 'Source/UnitTests/Common/MathUtilTest.cpp') diff --git a/Source/UnitTests/Common/MathUtilTest.cpp b/Source/UnitTests/Common/MathUtilTest.cpp index d2056df3f9..3df22847be 100644 --- a/Source/UnitTests/Common/MathUtilTest.cpp +++ b/Source/UnitTests/Common/MathUtilTest.cpp @@ -8,24 +8,16 @@ #include "Common/MathUtil.h" -template -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) -- cgit v1.2.3