From: Michał Dębski <debski.mi.zd@gmail.com>
Date: Sat, 21 Mar 2015 22:50:33 +0000 (+0100)
Subject: gleffects: Correct attributes for hconv and vconv shaders
X-Git-Tag: 1.19.3~507^2~8949
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ff4bc2364ccda262bc0690fe2934fcc68698a4a8;p=platform%2Fupstream%2Fgstreamer.git

gleffects: Correct attributes for hconv and vconv shaders

Width and height were switched for glow shaders. For blur
filter attributes names were obsolete.

https://bugzilla.gnome.org/show_bug.cgi?id=746209
---

diff --git a/ext/gl/effects/gstgleffectglow.c b/ext/gl/effects/gstgleffectglow.c
index a4f67ce..b3877150 100644
--- a/ext/gl/effects/gstgleffectglow.c
+++ b/ext/gl/effects/gstgleffectglow.c
@@ -97,7 +97,7 @@ gst_gl_effects_glow_step_two (gint width, gint height, guint texture,
 
   gst_gl_shader_set_uniform_1i (shader, "tex", 1);
   gst_gl_shader_set_uniform_1fv (shader, "kernel", 7, gauss_kernel);
-  gst_gl_shader_set_uniform_1f (shader, "gauss_width", height);
+  gst_gl_shader_set_uniform_1f (shader, "gauss_width", width);
 
   gst_gl_filter_draw_texture (filter, texture, width, height);
 }
@@ -134,7 +134,7 @@ gst_gl_effects_glow_step_three (gint width, gint height, guint texture,
 
   gst_gl_shader_set_uniform_1i (shader, "tex", 1);
   gst_gl_shader_set_uniform_1fv (shader, "kernel", 7, gauss_kernel);
-  gst_gl_shader_set_uniform_1f (shader, "gauss_height", width);
+  gst_gl_shader_set_uniform_1f (shader, "gauss_height", height);
 
   gst_gl_filter_draw_texture (filter, texture, width, height);
 }
diff --git a/ext/gl/gstglfilterblur.c b/ext/gl/gstglfilterblur.c
index c9a5d95..19da7b6 100644
--- a/ext/gl/gstglfilterblur.c
+++ b/ext/gl/gstglfilterblur.c
@@ -228,7 +228,7 @@ gst_gl_filterblur_hcallback (gint width, gint height, guint texture,
   gst_gl_shader_set_uniform_1i (filterblur->shader0, "tex", 1);
   gst_gl_shader_set_uniform_1fv (filterblur->shader0, "kernel", 7,
       filterblur->gauss_kernel);
-  gst_gl_shader_set_uniform_1f (filterblur->shader0, "width", width);
+  gst_gl_shader_set_uniform_1f (filterblur->shader0, "gauss_width", width);
 
   gst_gl_filter_draw_texture (filter, texture, width, height);
 }
@@ -255,7 +255,7 @@ gst_gl_filterblur_vcallback (gint width, gint height, guint texture,
   gst_gl_shader_set_uniform_1i (filterblur->shader1, "tex", 1);
   gst_gl_shader_set_uniform_1fv (filterblur->shader1, "kernel", 7,
       filterblur->gauss_kernel);
-  gst_gl_shader_set_uniform_1f (filterblur->shader1, "height", height);
+  gst_gl_shader_set_uniform_1f (filterblur->shader1, "gauss_height", height);
 
   gst_gl_filter_draw_texture (filter, texture, width, height);
 }