UniformTest.FloatUniformStateQuery do computations in doubles

src/tests/gl_tests/UniformTest.cpp

@@ -170,36 +170,35 @@ TEST_P(UniformTest, UniformArrayLocations)
 // Test that float to integer GetUniform rounds values correctly.
 TEST_P(UniformTest, FloatUniformStateQuery)
 {
-    std::vector<GLfloat> inValues;
+    std::vector<double> inValues;
     std::vector<GLfloat> expectedFValues;
     std::vector<GLint> expectedIValues;
 
-    GLfloat intMaxF = static_cast<GLfloat>(std::numeric_limits<GLint>::max());
-    GLfloat intMinF = static_cast<GLfloat>(std::numeric_limits<GLint>::min());
+    double intMaxD = static_cast<double>(std::numeric_limits<GLint>::max());
+    double intMinD = static_cast<double>(std::numeric_limits<GLint>::min());
 
     // TODO(jmadill): Investigate rounding of .5
-
-    inValues.push_back(-1.0f);
-    inValues.push_back(-0.6f);
-    // inValues.push_back(-0.5f); // undefined behaviour?
-    inValues.push_back(-0.4f);
-    inValues.push_back(0.0f);
-    inValues.push_back(0.4f);
-    // inValues.push_back(0.5f); // undefined behaviour?
-    inValues.push_back(0.6f);
-    inValues.push_back(1.0f);
-    inValues.push_back(999999.2f);
-    inValues.push_back(intMaxF * 2.0f);
-    inValues.push_back(intMaxF + 1.0f);
-    inValues.push_back(intMinF * 2.0f);
-    inValues.push_back(intMinF - 1.0f);
-
-    for (GLfloat value : inValues)
+    inValues.push_back(-1.0);
+    inValues.push_back(-0.6);
+    // inValues.push_back(-0.5); // undefined behaviour?
+    inValues.push_back(-0.4);
+    inValues.push_back(0.0);
+    inValues.push_back(0.4);
+    // inValues.push_back(0.5); // undefined behaviour?
+    inValues.push_back(0.6);
+    inValues.push_back(1.0);
+    inValues.push_back(999999.2);
+    inValues.push_back(intMaxD * 2.0);
+    inValues.push_back(intMaxD + 1.0);
+    inValues.push_back(intMinD * 2.0);
+    inValues.push_back(intMinD - 1.0);
+
+    for (double value : inValues)
     {
-        expectedFValues.push_back(value);
+        expectedFValues.push_back(static_cast<GLfloat>(value));
 
-        GLfloat clampedValue = std::max(intMinF, std::min(intMaxF, value));
-        GLfloat rounded = roundf(clampedValue);
+        double clampedValue = std::max(intMinD, std::min(intMaxD, value));
+        double rounded = round(clampedValue);
         expectedIValues.push_back(static_cast<GLint>(rounded));
     }
 
@@ -208,7 +207,7 @@ TEST_P(UniformTest, FloatUniformStateQuery)
 
     for (size_t index = 0; index < inValues.size(); ++index)
     {
-        GLfloat inValue       = inValues[index];
+        GLfloat inValue       = static_cast<GLfloat>(inValues[index]);
         GLfloat expectedValue = expectedFValues[index];
 
         glUniform1f(mUniformFLocation, inValue);
@@ -220,7 +219,7 @@ TEST_P(UniformTest, FloatUniformStateQuery)
 
     for (size_t index = 0; index < inValues.size(); ++index)
     {
-        GLfloat inValue     = inValues[index];
+        GLfloat inValue     = static_cast<GLfloat>(inValues[index]);
         GLint expectedValue = expectedIValues[index];
 
         glUniform1f(mUniformFLocation, inValue);