Make sure we do not send infinities to benchmarking textures.

[movit] / resample_effect_test.cpp

diff --git a/resample_effect_test.cpp b/resample_effect_test.cpp
index 84f61e78e16381bd70174c4fc470dfcc29591ccf..71354f209c4a2858553c3f00b939bce3fec1bb70 100644 (file)
--- a/resample_effect_test.cpp
+++ b/resample_effect_test.cpp
@@ -164,8 +164,13 @@ TEST(ResampleEffectTest, UpscaleByThreeGetsCorrectPixelCenters) {
        tester.run(out_data, GL_RED, COLORSPACE_sRGB, GAMMA_LINEAR);
 
        // We only bother checking that the middle pixel is still correct,
-       // and that symmetry holds.
-       EXPECT_FLOAT_EQ(1.0, out_data[7 * (size * 3) + 7]);
+       // and that symmetry holds. Note that the middle weight in practice
+       // becomes something like 0.99999 due to the normalization
+       // (some supposedly zero weights become 1e-6 or so), and then after
+       // squaring, the error compounds. Ironically, less texture precision
+       // here will give a more accurate result, since the weight can get
+       // rounded towards 1.0.
+       EXPECT_NEAR(1.0, out_data[7 * (size * 3) + 7], 1e-3);
        for (unsigned y = 0; y < size * 3; ++y) {
                for (unsigned x = 0; x < size * 3; ++x) {
                        EXPECT_NEAR(out_data[y * (size * 3) + x], out_data[(size * 3 - y - 1) * (size * 3) + x], 1e-6);
@@ -447,7 +452,7 @@ void BM_ResampleEffect(benchmark::State &state, GammaCurve gamma_curve, GLenum o
        unique_ptr<T[]> out_data(new T[out_width * out_height * 4]);
 
        for (unsigned i = 0; i < in_width * in_height * 4; ++i) {
-               data[i] = from_fp32<T>(float(rand()));
+               data[i] = from_fp32<T>(rand() / (RAND_MAX + 1.0));
        }
 
        EffectChainTester tester(nullptr, out_width, out_height, FORMAT_BGRA_POSTMULTIPLIED_ALPHA, COLORSPACE_sRGB, gamma_curve, output_format);