X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=resample_effect_test.cpp;h=95c2bcfb9aec95693653ea65572cfdca76f79699;hp=e4c23b10782c09e96fa91cd2a4cb030a7faf9c6c;hb=ddf71f853e64c3912eed4ab98bfe7503826ce8e1;hpb=aa3e630eb0c455921c721f9ccd84e872bc9757bc

diff --git a/resample_effect_test.cpp b/resample_effect_test.cpp
index e4c23b1..95c2bcf 100644
--- 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)
@@ -168,22 +169,25 @@ TEST(ResampleEffectTest, UpscaleByThreeGetsCorrectPixelCenters) {
 }
 
 TEST(ResampleEffectTest, HeavyResampleGetsSumRight) {
-	const int swidth = 1280, sheight = 720;
-	const int dwidth = 36, dheight = 20;
+	// Do only one resample pass, more specifically the last one, which goes to
+	// our fp32 output. This allows us to analyze the precision without intermediate
+	// fp16 rounding.
+	const int swidth = 1, sheight = 1280;
+	const int dwidth = 1, dheight = 64;
 
 	float data[swidth * sheight], out_data[dwidth * dheight], expected_data[dwidth * dheight];
 	for (int y = 0; y < sheight; ++y) {
 		for (int x = 0; x < swidth; ++x) {
-			data[y * swidth + x] = 0.5f;
+			data[y * swidth + x] = 1.0f;
 		}
 	}
 	for (int y = 0; y < dheight; ++y) {
 		for (int x = 0; x < dwidth; ++x) {
-			expected_data[y * dwidth + x] = 0.5f;
+			expected_data[y * dwidth + x] = 1.0f;
 		}
 	}
 
-	EffectChainTester tester(NULL, dwidth, dheight, FORMAT_GRAYSCALE, COLORSPACE_sRGB, GAMMA_LINEAR);
+	EffectChainTester tester(NULL, dwidth, dheight, FORMAT_GRAYSCALE, COLORSPACE_sRGB, GAMMA_LINEAR, GL_RGBA32F);
 
 	ImageFormat format;
 	format.color_space = COLORSPACE_sRGB;
@@ -198,6 +202,10 @@ TEST(ResampleEffectTest, HeavyResampleGetsSumRight) {
 	ASSERT_TRUE(resample_effect->set_int("height", dheight));
 	tester.run(out_data, GL_RED, COLORSPACE_sRGB, GAMMA_LINEAR);
 
-	expect_equal(expected_data, out_data, dwidth, dheight, 0.001);
+	// 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