brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[shader] Remove deprecated set_uniform_1f()

Browse Source 
Since we're planning to release 1.0 without any of the deprecated
API baggage, we can simply remove the set_uniform_1f() method from
ClutterShader public API and add it to the deprecated header.
This commit is contained in:
Emmanuele Bassi 2009-04-01 11:08:28 +01:00
parent c3d9f0bed4
commit 9d0ce68c2f
4 changed files with 2 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
clutter/clutter-deprecated.h
View File

@ -146,4 +146,6 @@
#define clutter_effect_scale clutter_effect_scale_DEPRECATED_BY_clutter_actor_animate #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_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 */ #endif /* CLUTTER_DEPRECATED_H */

25
clutter/clutter-shader.c
View File

@ -695,31 +695,6 @@ clutter_shader_get_is_enabled (ClutterShader *shader)
return shader->priv->is_enabled; 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: * clutter_shader_set_uniform:
* @shader: a #ClutterShader. * @shader: a #ClutterShader.

6
clutter/clutter-shader.h
View File

@ -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_fragment_shader (ClutterShader *shader);
CoglHandle clutter_shader_get_cogl_vertex_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 */ /* private */
void _clutter_shader_release_all (void); void _clutter_shader_release_all (void);

1
doc/reference/clutter/clutter-sections.txt
View File

@ -1380,7 +1380,6 @@ clutter_shader_set_uniform
clutter_shader_get_cogl_program clutter_shader_get_cogl_program
clutter_shader_get_cogl_fragment_shader clutter_shader_get_cogl_fragment_shader
clutter_shader_get_cogl_vertex_shader clutter_shader_get_cogl_vertex_shader
clutter_shader_set_uniform_1f
<SUBSECTION> <SUBSECTION>
CLUTTER_VALUE_HOLDS_SHADER_FLOAT CLUTTER_VALUE_HOLDS_SHADER_FLOAT