Merge pull request #7457 from Tilka/use_clamp

VideoSoftware: make use of Clamp()
dolphin-emu · Oct 7, 2018 · 1ab1d41 · 1ab1d41
2 parents 0bef9fa + a6a5d86
commit 1ab1d41
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/Source/Core/VideoBackends/Software/Tev.cpp b/Source/Core/VideoBackends/Software/Tev.cpp
@@ -6,6 +6,7 @@
 
 #include "Common/ChunkFile.h"
 #include "Common/CommonTypes.h"
+#include "Common/MathUtil.h"
 #include "VideoBackends/Software/DebugUtil.h"
 #include "VideoBackends/Software/EfbInterface.h"
 #include "VideoBackends/Software/Tev.h"
@@ -776,9 +777,7 @@ void Tev::Draw()
       // Based on that, choose the index such that points which are far away from the z-axis use the
       // 10th "k" value and such that central points use the first value.
       float floatindex = 9.f - std::abs(offset) * 9.f;
-      floatindex = (floatindex < 0.f) ?
+      floatindex = MathUtil::Clamp(floatindex, 0.f, 9.f);  // TODO: This shouldn't be necessary!
-                       0.f :
-                       (floatindex > 9.f) ? 9.f : floatindex;  // TODO: This shouldn't be necessary!
 
       // Get the two closest integer indices, look up the corresponding samples
       const int indexlower = (int)floor(floatindex);
@@ -799,7 +798,7 @@ void Tev::Draw()
     ze -= bpmem.fog.GetC();
 
     // clamp 0 to 1
-    float fog = (ze < 0.0f) ? 0.0f : ((ze > 1.0f) ? 1.0f : ze);
+    float fog = MathUtil::Clamp(ze, 0.f, 1.f);
 
     switch (bpmem.fog.c_proj_fsel.fsel)
     {