[227/906] explicitly bind the main texture and the curve one to separate units in...

diff --git a/gst/gl/effects/gstgleffectlumatocurve.c b/gst/gl/effects/gstgleffectlumatocurve.c
index 86fabcd..c09869b 100644 (file)
--- a/gst/gl/effects/gstgleffectlumatocurve.c
+++ b/gst/gl/effects/gstgleffectlumatocurve.c
@@ -62,7 +62,15 @@ static void gst_gl_effects_luma_to_curve (GstGLEffects *effects,
     
     glDisable(GL_TEXTURE_1D);
   }
-    
+
+  glActiveTexture (GL_TEXTURE0);
+  glEnable (GL_TEXTURE_RECTANGLE_ARB);
+  glBindTexture (GL_TEXTURE_RECTANGLE_ARB, texture);
+
+  gst_gl_shader_set_uniform_1i (shader, "tex", 0);
+
+  glDisable (GL_TEXTURE_RECTANGLE_ARB);
+
   glActiveTexture (GL_TEXTURE5);
   glEnable (GL_TEXTURE_1D);
   glBindTexture (GL_TEXTURE_1D, effects->curve[curve_index]);

diff --git a/gst/gl/effects/gstgleffectrgbtocurve.c b/gst/gl/effects/gstgleffectrgbtocurve.c
index d1b3128..f4ae3ed 100644 (file)
--- a/gst/gl/effects/gstgleffectrgbtocurve.c
+++ b/gst/gl/effects/gstgleffectrgbtocurve.c
@@ -59,10 +59,18 @@ static void gst_gl_effects_rgb_to_curve (GstGLEffects *effects,
                  curve.width, 0,
                  GL_RGB, GL_UNSIGNED_BYTE,
                  curve.pixel_data);
-    
+
     glDisable(GL_TEXTURE_1D);
   }
-    
+
+  glActiveTexture (GL_TEXTURE0);
+  glEnable (GL_TEXTURE_RECTANGLE_ARB);
+  glBindTexture (GL_TEXTURE_RECTANGLE_ARB, texture);
+
+  gst_gl_shader_set_uniform_1i (shader, "tex", 0);
+
+  glDisable (GL_TEXTURE_RECTANGLE_ARB);
+
   glActiveTexture (GL_TEXTURE5);
   glEnable (GL_TEXTURE_1D);
   glBindTexture (GL_TEXTURE_1D, effects->curve[curve_index]);