Merge branch 'master' into epoxy

[movit] / resample_effect_test.cpp

diff --git a/resample_effect_test.cpp b/resample_effect_test.cpp
index dee08e3584c2f90c9da43aaff82c2e99a35817d2..95c2bcfb9aec95693653ea65572cfdca76f79699 100644 (file)
--- a/resample_effect_test.cpp
+++ b/resample_effect_test.cpp
@@ -1,16 +1,17 @@
 // Unit tests for ResampleEffect.
 
-#include <GL/glew.h>
+#include <epoxy/gl.h>
+#include <gtest/gtest.h>
 #include <math.h>
 
 #include "effect_chain.h"
 #include "flat_input.h"
-#include "glew.h"
-#include "gtest/gtest.h"
 #include "image_format.h"
 #include "resample_effect.h"
 #include "test_util.h"
 
+namespace movit {
+
 namespace {
 
 float sinc(float x)
@@ -201,10 +202,10 @@ TEST(ResampleEffectTest, HeavyResampleGetsSumRight) {
        ASSERT_TRUE(resample_effect->set_int("height", dheight));
        tester.run(out_data, GL_RED, COLORSPACE_sRGB, GAMMA_LINEAR);
 
-       // Require that we are within 10-bit accuracy. Note that this is for
-       // one pass only; some cards that don't have correct fp32 -> fp16
-       // rounding in the intermediate framebuffers will go outside this after
-       // a 2D resize. This limit is tight enough that it will be good enough
-       // for 8-bit accuracy, though.
-       expect_equal(expected_data, out_data, dwidth, dheight, 0.5 / 1023.0);
+       // Require that we are within 10-bit accuracy. Note that this limit is for
+       // one pass only, but the limit is tight enough that it should be good enough
+       // for 10-bit accuracy even after two passes.
+       expect_equal(expected_data, out_data, dwidth, dheight, 0.1 / 1023.0);
 }
+
+}  // namespace movit