diff options
| author | Robert Bragg <robert@linux.intel.com> | 2010-08-10 14:27:53 +0100 |
|---|---|---|
| committer | Damien Lespiau <damien.lespiau@intel.com> | 2010-08-18 16:39:12 +0100 |
| commit | b652a56f25d62958a259e2f836e6e36293b6ab9a (patch) | |
| tree | 72b3cd84458d9855877336cf40019e1d2fa7e90d /clutter-gst/clutter-gst-video-sink.c | |
| parent | 7f65e5199d8a59ea43ec96d9eaa4375f53e37441 (diff) | |
| download | clutter-gst-b652a56f25d62958a259e2f836e6e36293b6ab9a.tar.gz | |
sink: glsl: associate y,u,vtex uniforms with units 0,1,2
This makes the yuv texture unit association consistent with the arbfp
fragment program since the arbfp and glsl code paths both share the same
texture upload code path.
Diffstat (limited to 'clutter-gst/clutter-gst-video-sink.c')
| -rw-r--r-- | clutter-gst/clutter-gst-video-sink.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/clutter-gst/clutter-gst-video-sink.c b/clutter-gst/clutter-gst-video-sink.c index 81de0b7..dc465ff 100644 --- a/clutter-gst/clutter-gst-video-sink.c +++ b/clutter-gst/clutter-gst-video-sink.c @@ -672,9 +672,9 @@ clutter_gst_i420_glsl_init (ClutterGstVideoSink *sink) cogl_program_use (priv->program); location = cogl_program_get_uniform_location (priv->program, "ytex"); cogl_program_uniform_1i (location, 0); - location = cogl_program_get_uniform_location (priv->program, "vtex"); - cogl_program_uniform_1i (location, 1); location = cogl_program_get_uniform_location (priv->program, "utex"); + cogl_program_uniform_1i (location, 1); + location = cogl_program_get_uniform_location (priv->program, "vtex"); cogl_program_uniform_1i (location, 2); cogl_program_use (COGL_INVALID_HANDLE); |