X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=resample_effect.cpp;h=600b939ace7107b3db9fc7295ef4b13655b5a41e;hp=c0afe0b1964ec06c2ab757883327c6a13570276a;hb=29072985d0a00a53e5b578a1444cee61a0c9e1f2;hpb=17195eb5da34f03778cde297eb77c486fa0c51bc

diff --git a/resample_effect.cpp b/resample_effect.cpp
index c0afe0b..600b939 100644
--- a/resample_effect.cpp
+++ b/resample_effect.cpp
@@ -3,11 +3,11 @@
 
 #include <math.h>
 #include <assert.h>
+#include <GL/glew.h>
 
 #include "resample_effect.h"
 #include "effect_chain.h"
 #include "util.h"
-#include "opengl.h"
 
 namespace {
 
@@ -74,9 +74,12 @@ unsigned combine_samples(float *src, float *dst, unsigned num_src_samples, unsig
 		float offset, total_weight, sum_sq_error;
 		combine_two_samples(w1, w2, &offset, &total_weight, &sum_sq_error);
 
-		// If the interpolation error is larger than that of one level
-		// at 8-bit precision, don't combine.
-		if (sum_sq_error > 1.0f / (256.0f * 256.0f)) {
+		// If the interpolation error is larger than that of about sqrt(2) of
+		// a level at 8-bit precision, don't combine. (You'd think 1.0 was enough,
+		// but since the artifacts are not really random, they can get quite
+		// visible. On the other hand, going to 0.25f, I can see no change at
+		// all with 8-bit output, so it would not seem to be worth it.)
+		if (sum_sq_error > 0.5f / (256.0f * 256.0f)) {
 			continue;
 		}
 
@@ -103,9 +106,9 @@ ResampleEffect::ResampleEffect()
 
 	// The first blur pass will forward resolution information to us.
 	hpass = new SingleResamplePassEffect(this);
-	hpass->set_int("direction", SingleResamplePassEffect::HORIZONTAL);
+	CHECK(hpass->set_int("direction", SingleResamplePassEffect::HORIZONTAL));
 	vpass = new SingleResamplePassEffect(NULL);
-	vpass->set_int("direction", SingleResamplePassEffect::VERTICAL);
+	CHECK(vpass->set_int("direction", SingleResamplePassEffect::VERTICAL));
 
 	update_size();
 }