X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=resample_effect.cpp;h=50b7c6bc5c4730fc6bb25cd18c96a446c8f02986;hp=4af60de7d3c47c6089a560f0d23c2ce62594cd81;hb=refs%2Fheads%2Fepoxy;hpb=f62661c1bef3acac7b98631970700dfa5ac94768;ds=sidebyside

diff --git a/resample_effect.cpp b/resample_effect.cpp
index 4af60de..50b7c6b 100644
--- a/resample_effect.cpp
+++ b/resample_effect.cpp
@@ -1,7 +1,7 @@
 // Three-lobed Lanczos, the most common choice.
 #define LANCZOS_RADIUS 3.0
 
-#include <GL/glew.h>
+#include <epoxy/gl.h>
 #include <assert.h>
 #include <limits.h>
 #include <math.h>
@@ -413,7 +413,8 @@ void SingleResamplePassEffect::set_gl_state(GLuint glsl_program_num, const strin
 
 	// We specifically do not want mipmaps on the input texture;
 	// they break minification.
-	glActiveTexture(GL_TEXTURE0);
+	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();