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

shader-effect: Remove unused function

Browse Source 
The reset_uniforms() internal function is not used any more because the
CoglProgram cannot be reset post-creation - hence the uniforms cannot
change.
This commit is contained in:
Emmanuele Bassi 2010-11-29 10:59:16 +00:00
parent 08087c965b
commit 850a35f069
1 changed files with 14 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
clutter/clutter-shader-effect.c
View File

@ -182,26 +182,6 @@ clutter_shader_effect_clear (ClutterShaderEffect *self,
priv->source_set = FALSE; priv->source_set = FALSE;
} }
static void
clutter_shader_effect_reset_uniforms (ClutterShaderEffect *effect)
{
ClutterShaderEffectPrivate *priv = effect->priv;
GHashTableIter iter;
gpointer key, value;
if (priv->uniforms == NULL)
return;
key = value = NULL;
g_hash_table_iter_init (&iter, priv->uniforms);
while (g_hash_table_iter_next (&iter, &key, &value))
{
ShaderUniform *uniform = value;
uniform->location = -1;
}
}
static void static void
clutter_shader_effect_update_uniforms (ClutterShaderEffect *effect) clutter_shader_effect_update_uniforms (ClutterShaderEffect *effect)
{ {
@ -826,20 +806,22 @@ clutter_shader_effect_set_shader_source (ClutterShaderEffect *effect,
priv->program = cogl_create_program (); priv->program = cogl_create_program ();
if (priv->shader == COGL_INVALID_HANDLE) if (priv->shader == COGL_INVALID_HANDLE)
switch (priv->shader_type) {
{ switch (priv->shader_type)
case CLUTTER_FRAGMENT_SHADER: {
priv->shader = cogl_create_shader (COGL_SHADER_TYPE_FRAGMENT); case CLUTTER_FRAGMENT_SHADER:
break; priv->shader = cogl_create_shader (COGL_SHADER_TYPE_FRAGMENT);
break;
case CLUTTER_VERTEX_SHADER: case CLUTTER_VERTEX_SHADER:
priv->shader = cogl_create_shader (COGL_SHADER_TYPE_VERTEX); priv->shader = cogl_create_shader (COGL_SHADER_TYPE_VERTEX);
break; break;
default: default:
priv->shader = COGL_INVALID_HANDLE; priv->shader = COGL_INVALID_HANDLE;
break; break;
} }
}
g_assert (priv->shader != COGL_INVALID_HANDLE); g_assert (priv->shader != COGL_INVALID_HANDLE);