X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=resample_effect.cpp;h=713df86d7e7dc864377c409c67709c99c32d6e61;hp=d136e1c477267af95182497c9f0c0d8d8da01b14;hb=95edbfccb0843da3cc105dadc5bc6d8e102f6071;hpb=c783d084e831c1a2112b9c9309407a03b5a4cf20

diff --git a/resample_effect.cpp b/resample_effect.cpp
index d136e1c..713df86 100644
--- a/resample_effect.cpp
+++ b/resample_effect.cpp
@@ -423,7 +423,6 @@ void SingleResamplePassEffect::update_texture(GLuint glsl_program_num, const str
 
 		// Normalize so that the sum becomes one. Note that we do it twice;
 		// this sometimes helps a tiny little bit when we have many samples.
-#if 0
 		for (int normalize_pass = 0; normalize_pass < 2; ++normalize_pass) {
 			double sum = 0.0;
 			for (int i = 0; i < src_bilinear_samples; ++i) {
@@ -434,7 +433,6 @@ void SingleResamplePassEffect::update_texture(GLuint glsl_program_num, const str
 					fp16_to_fp64(bilinear_weights_fp16_ptr[i * 2 + 0]) / sum);
 			}
 		}
-#endif
 	}
 
 	// Encode as a two-component texture. Note the GL_REPEAT.
@@ -486,7 +484,7 @@ void SingleResamplePassEffect::set_gl_state(GLuint glsl_program_num, const strin
 	check_error();
 
 	set_uniform_int(glsl_program_num, prefix, "sample_tex", *sampler_num);
-	++sampler_num;
+	++*sampler_num;
 	set_uniform_int(glsl_program_num, prefix, "num_samples", src_bilinear_samples);
 	set_uniform_float(glsl_program_num, prefix, "num_loops", num_loops);
 	set_uniform_float(glsl_program_num, prefix, "slice_height", slice_height);