Merge pull request #623 from phire/sw-xfb-clamping

Fix incorrect clamping in SWRenderer.

1 files changed, 6 insertions, 14 deletions

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 <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)