X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=resample_effect.cpp;h=a7315689532e85a98a9c2b7884ec52b85f2ed7db;hp=958ed25b9c035a9ca1ad59109294b9cc96ed97ff;hb=6ec130490868eb8316cb2cdce9fbfd237d25a00e;hpb=6bf496a34a84fb14b1b3b6debfd42ba36568b879

diff --git a/resample_effect.cpp b/resample_effect.cpp
index 958ed25..a731568 100644
--- a/resample_effect.cpp
+++ b/resample_effect.cpp
@@ -74,6 +74,9 @@ float lanczos_weight(float x)
 //
 // Solve for e = 1e-6 yields a step size of 0.0027, which to cover the range
 // 0..3 needs 1109 steps. We round up to the next power of two, just to be sure.
+//
+// You need to call lanczos_table_init_done before the first call to
+// lanczos_weight_cached.
 #define LANCZOS_TABLE_SIZE 2048
 bool lanczos_table_init_done = false;
 float lanczos_table[LANCZOS_TABLE_SIZE + 2];
@@ -88,11 +91,6 @@ void init_lanczos_table()
 
 float lanczos_weight_cached(float x)
 {
-	if (!lanczos_table_init_done) {
-		// Could in theory race between two threads if we are unlucky,
-		// but that is harmless, since they'll write the same data.
-		init_lanczos_table();
-	}
 	x = fabs(x);
 	if (x > LANCZOS_RADIUS) {
 		return 0.0f;
@@ -461,6 +459,12 @@ SingleResamplePassEffect::SingleResamplePassEffect(ResampleEffect *parent)
 	register_uniform_float("whole_pixel_offset", &uniform_whole_pixel_offset);
 
 	glGenTextures(1, &texnum);
+
+	if (!lanczos_table_init_done) {
+		// Could in theory race between two threads if we are unlucky,
+		// but that is harmless, since they'll write the same data.
+		init_lanczos_table();
+	}
 }
 
 SingleResamplePassEffect::~SingleResamplePassEffect()
@@ -713,10 +717,12 @@ void SingleResamplePassEffect::set_gl_state(GLuint glsl_program_num, const strin
 	// We specifically do not want mipmaps on the input texture;
 	// they break minification.
 	Node *self = chain->find_node_for_effect(this);
-	glActiveTexture(chain->get_input_sampler(self, 0));
-	check_error();
-	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-	check_error();
+	if (chain->has_input_sampler(self, 0)) {
+		glActiveTexture(chain->get_input_sampler(self, 0));
+		check_error();
+		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+		check_error();
+	}
 }
 
 }  // namespace movit