Reduce math function duplication.

Change-Id: If0fe05eff397c8d88753fb2b1a1852722c73602e Reviewed-on: https://swiftshader-review.googlesource.com/4979Tested-by: Nicolas Capens <capn@google.com> Reviewed-by: Alexis Hétu <sugoi@google.com> Reviewed-by: Nicolas Capens <capn@google.com>

Reduce math function duplication.
dc4ae86d · Nicolas Capens · 7155963e · dc4ae86d · dc4ae86d · dc4ae86d
Commit dc4ae86d authored Mar 21, 2016 by Nicolas Capens
Showing with 12 additions and 38 deletions

Math.hpp src/Common/Math.hpp +5 -0

mathutil.h src/OpenGL/libGL/mathutil.h +2 -10

mathutil.h src/OpenGL/libGLES_CM/mathutil.h +2 -10

mathutil.h src/OpenGL/libGLESv2/mathutil.h +3 -18

No files found.
--- a/src/Common/Math.hpp
+++ b/src/Common/Math.hpp
@@ -174,6 +174,11 @@ namespace sw
 		return x;
 	}
+	inline float clamp01(float x)
+	{
+		return clamp(x, 0.0f, 1.0f);
+	}
 	inline int ceilPow2(int x)
 	{
 		int i = 1;

--- a/src/OpenGL/libGL/mathutil.h
+++ b/src/OpenGL/libGL/mathutil.h
@@ -44,16 +44,8 @@ inline unsigned int ceilPow2(unsigned int x)
    return x;
 }
-template<typename T, typename MIN, typename MAX>
+using sw::clamp;
-inline T clamp(T x, MIN min, MAX max)
+using sw::clamp01;
-{
-    return x < min ? min : (x > max ? max : x);
-}
-inline float clamp01(float x)
-{
-    return clamp(x, 0.0f, 1.0f);
-}
 template<const int n>
 inline unsigned int unorm(float x)

--- a/src/OpenGL/libGLES_CM/mathutil.h
+++ b/src/OpenGL/libGLES_CM/mathutil.h
@@ -44,16 +44,8 @@ inline unsigned int ceilPow2(unsigned int x)
    return x;
 }
-template<typename T, typename MIN, typename MAX>
+using sw::clamp;
-inline T clamp(T x, MIN min, MAX max)
+using sw::clamp01;
-{
-    return x < min ? min : (x > max ? max : x);
-}
-inline float clamp01(float x)
-{
-    return clamp(x, 0.0f, 1.0f);
-}
 template<const int n>
 inline unsigned int unorm(float x)

--- a/src/OpenGL/libGLESv2/mathutil.h
+++ b/src/OpenGL/libGLESv2/mathutil.h
@@ -44,24 +44,9 @@ inline unsigned int ceilPow2(unsigned int x)
    return x;
 }
-template<typename T, typename MIN, typename MAX>
+using sw::swap;
-inline T clamp(T x, MIN min, MAX max)
+using sw::clamp;
-{
+using sw::clamp01;
-    return x < min ? min : (x > max ? max : x);
-}
-template<class T>
-inline void swap(T &a, T &b)
-{
-	T t = a;
-	a = b;
-	b = t;
-}
-inline float clamp01(float x)
-{
-    return clamp(x, 0.0f, 1.0f);
-}
 template<const int n>
 inline unsigned int unorm(float x)