diff --git a/clutter/clutter-deprecated.h b/clutter/clutter-deprecated.h index f45afd72f..8e99ab951 100644 --- a/clutter/clutter-deprecated.h +++ b/clutter/clutter-deprecated.h @@ -146,4 +146,6 @@ #define clutter_effect_scale clutter_effect_scale_DEPRECATED_BY_clutter_actor_animate #define clutter_effect_rotate clutter_effect_rotate_DEPRECATED_BY_clutter_actor_animate +#define clutter_shader_set_uniform_1f clutter_shader_set_uniform_1f_REPLACED_BY_clutter_shader_set_uniform + #endif /* CLUTTER_DEPRECATED_H */ diff --git a/clutter/clutter-shader.c b/clutter/clutter-shader.c index abf72e4ce..b23c70af3 100644 --- a/clutter/clutter-shader.c +++ b/clutter/clutter-shader.c @@ -695,31 +695,6 @@ clutter_shader_get_is_enabled (ClutterShader *shader) return shader->priv->is_enabled; } -/** - * clutter_shader_set_uniform_1f: - * @shader: a #ClutterShader - * @name: name of uniform in vertex or fragment program to set. - * @value: the new value of the uniform. - * - * Sets a user configurable variable in the shader programs attached - * to a #ClutterShader. - * - * Since: 0.6 - * - * Deprecated: 1.0: Use clutter_shader_set_uniform() instead - */ -void -clutter_shader_set_uniform_1f (ClutterShader *shader, - const gchar *name, - gfloat value) -{ - GValue real_value = { 0, }; - - g_value_init (&real_value, G_TYPE_FLOAT); - clutter_shader_set_uniform (shader, name, &real_value); - g_value_unset (&real_value); -} - /** * clutter_shader_set_uniform: * @shader: a #ClutterShader. diff --git a/clutter/clutter-shader.h b/clutter/clutter-shader.h index bd18a3a02..b3c2ae483 100644 --- a/clutter/clutter-shader.h +++ b/clutter/clutter-shader.h @@ -129,12 +129,6 @@ CoglHandle clutter_shader_get_cogl_program (ClutterShader CoglHandle clutter_shader_get_cogl_fragment_shader (ClutterShader *shader); CoglHandle clutter_shader_get_cogl_vertex_shader (ClutterShader *shader); -#ifndef CLUTTER_DISABLE_DEPRECATED -void clutter_shader_set_uniform_1f (ClutterShader *shader, - const gchar *name, - gfloat value); -#endif - /* private */ void _clutter_shader_release_all (void); diff --git a/doc/reference/clutter/clutter-sections.txt b/doc/reference/clutter/clutter-sections.txt index 52d4f816b..8f47ca240 100644 --- a/doc/reference/clutter/clutter-sections.txt +++ b/doc/reference/clutter/clutter-sections.txt @@ -1380,7 +1380,6 @@ clutter_shader_set_uniform clutter_shader_get_cogl_program clutter_shader_get_cogl_fragment_shader clutter_shader_get_cogl_vertex_shader -clutter_shader_set_uniform_1f CLUTTER_VALUE_HOLDS_SHADER_FLOAT