diff options
| author | Damien Lespiau <damien.lespiau@intel.com> | 2009-06-29 11:29:45 +0200 |
|---|---|---|
| committer | Damien Lespiau <damien.lespiau@intel.com> | 2009-06-29 11:37:07 +0200 |
| commit | f3a826b9f4b24347f8bf23adbb6d6f57c34605b2 (patch) | |
| tree | 0a30d8d80670bc642c446c1bf6769251a61e862b /clutter-gst/clutter-gst-video-sink.c | |
| parent | 74aa6f13012b06116fe2b3018f8f22e1695e6d69 (diff) | |
| download | clutter-gst-f3a826b9f4b24347f8bf23adbb6d6f57c34605b2.tar.gz | |
[videosink] GLSL only functions should say so
set_shader() is a GLSL only function. It's name should reflect that
fact.
Diffstat (limited to 'clutter-gst/clutter-gst-video-sink.c')
| -rw-r--r-- | clutter-gst/clutter-gst-video-sink.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/clutter-gst/clutter-gst-video-sink.c b/clutter-gst/clutter-gst-video-sink.c index 8645f86..287cd8b 100644 --- a/clutter-gst/clutter-gst-video-sink.c +++ b/clutter-gst/clutter-gst-video-sink.c @@ -317,8 +317,8 @@ clutter_gst_video_sink_paint (ClutterActor *actor, } static void -clutter_gst_video_sink_set_shader (ClutterGstVideoSink *sink, - const gchar *shader_src) +clutter_gst_video_sink_set_glsl_shader (ClutterGstVideoSink *sink, + const gchar *shader_src) { ClutterGstVideoSinkPrivate *priv = sink->priv; @@ -532,7 +532,7 @@ clutter_gst_yv12_glsl_init (ClutterGstVideoSink *sink) ClutterGstVideoSinkPrivate *priv= sink->priv; GLint location; - clutter_gst_video_sink_set_shader (sink, yv12_to_rgba_shader); + clutter_gst_video_sink_set_glsl_shader (sink, yv12_to_rgba_shader); cogl_program_use (priv->program); location = cogl_program_get_uniform_location (priv->program, "ytex"); @@ -552,7 +552,7 @@ clutter_gst_yv12_glsl_init (ClutterGstVideoSink *sink) static void clutter_gst_yv12_glsl_deinit (ClutterGstVideoSink *sink) { - clutter_gst_video_sink_set_shader (sink, NULL); + clutter_gst_video_sink_set_glsl_shader (sink, NULL); } @@ -638,7 +638,7 @@ clutter_gst_i420_glsl_init (ClutterGstVideoSink *sink) ClutterGstVideoSinkPrivate *priv = sink->priv; GLint location; - clutter_gst_video_sink_set_shader (sink, yv12_to_rgba_shader); + clutter_gst_video_sink_set_glsl_shader (sink, yv12_to_rgba_shader); cogl_program_use (priv->program); location = cogl_program_get_uniform_location (priv->program, "ytex"); @@ -714,13 +714,13 @@ static ClutterGstRenderer i420_fp_renderer = static void clutter_gst_ayuv_glsl_init(ClutterGstVideoSink *sink) { - clutter_gst_video_sink_set_shader (sink, ayuv_to_rgba_shader); + clutter_gst_video_sink_set_glsl_shader (sink, ayuv_to_rgba_shader); } static void clutter_gst_ayuv_glsl_deinit(ClutterGstVideoSink *sink) { - clutter_gst_video_sink_set_shader (sink, NULL); + clutter_gst_video_sink_set_glsl_shader (sink, NULL); } static void |