Remove unused min/max definitions.

BUG=17878699

Change-Id: If48ef9b43e140e9f43687edf55928d932247d513
Reviewed-on: https://swiftshader-review.googlesource.com/1201
Reviewed-by: Nicolas Capens <nicolascapens@google.com>
Tested-by: Nicolas Capens <nicolascapens@google.com>

diff --git a/src/Common/Math.hpp b/src/Common/Math.hpp
index 5631bd6..a219dba 100644 (file)
--- a/src/Common/Math.hpp
+++ b/src/Common/Math.hpp
@@ -29,66 +29,18 @@ namespace sw
        #undef min\r
        #undef max\r
 \r
-       inline float max(float a, float b)\r
-       {\r
-               return a > b ? a : b;\r
-       }\r
-\r
-       inline float min(float a, float b)\r
-       {\r
-               return a < b ? a : b;\r
-       }\r
-\r
-       inline float max(float a, float b, float c)\r
-       {\r
-               return max(max(a, b), c);\r
-       }\r
-\r
-       inline float min(float a, float b, float c)\r
-       {\r
-               return min(min(a, b), c);\r
-       }\r
-\r
-       inline float max(float a, float b, float c, float d)\r
-       {\r
-               return max(max(a, b), max(c, d));\r
-       }\r
-\r
-       inline float min(float a, float b, float c, float d)\r
-       {\r
-               return min(min(a, b), min(c, d));\r
-       }\r
-\r
-       inline int max(int a, int b)\r
+       template<class T>\r
+       inline T max(T a, T b)\r
        {\r
                return a > b ? a : b;\r
        }\r
 \r
-       inline int min(int a, int b)\r
+       template<class T>\r
+       inline T min(T a, T b)\r
        {\r
                return a < b ? a : b;\r
        }\r
 \r
-       inline int max(int a, int b, int c)\r
-       {\r
-               return max(max(a, b), c);\r
-       }\r
-\r
-       inline int min(int a, int b, int c)\r
-       {\r
-               return min(min(a, b), c);\r
-       }\r
-\r
-       inline int max(int a, int b, int c, int d)\r
-       {\r
-               return max(max(a, b), max(c, d));\r
-       }\r
-\r
-       inline int min(int a, int b, int c, int d)\r
-       {\r
-               return min(min(a, b), min(c, d));\r
-       }\r
-\r
        template<class T>\r
        inline void swap(T &a, T &b)\r
        {\r

diff --git a/src/GLES2/libGLESv2/Device.hpp b/src/GLES2/libGLESv2/Device.hpp
index dcee30f..4e0337d 100644 (file)
--- a/src/GLES2/libGLESv2/Device.hpp
+++ b/src/GLES2/libGLESv2/Device.hpp
@@ -88,9 +88,9 @@ namespace gl
                sw::VertexShader *vertexShader;\r
 \r
                bool pixelShaderDirty;\r
-               int pixelShaderConstantsFDirty;\r
+               unsigned int pixelShaderConstantsFDirty;\r
                bool vertexShaderDirty;\r
-               int vertexShaderConstantsFDirty;\r
+               unsigned int vertexShaderConstantsFDirty;\r
 \r
                float pixelShaderConstantF[224][4];\r
                float vertexShaderConstantF[256][4];\r