isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-02-09 01:54:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

ClutterShaderEffect: Don't throw away the program for a new actor

Browse Source 
Previously when the shader effect is used with a new actor it would
end up throwing away the old program. I don't think this is neccessary
and it means if you use an effect to temporarily bind to an actor then
it will recompile the shader whenever it is applied.

http://bugzilla.clutter-project.org/show_bug.cgi?id=2454
This commit is contained in:
Neil Roberts 2010-11-27 16:26:20 +00:00 committed by Emmanuele Bassi
parent 2dc9e0dc29
commit 08087c965b
1 changed files with 19 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -297,9 +297,6 @@ clutter_shader_effect_set_actor (ClutterActorMeta *meta,
return; return;
} }
clutter_shader_effect_clear (self, FALSE);
clutter_shader_effect_reset_uniforms (self);
parent = CLUTTER_ACTOR_META_CLASS (clutter_shader_effect_parent_class); parent = CLUTTER_ACTOR_META_CLASS (clutter_shader_effect_parent_class);
parent->set_actor (meta, actor); parent->set_actor (meta, actor);
@ -310,25 +307,6 @@ clutter_shader_effect_set_actor (ClutterActorMeta *meta,
CLUTTER_NOTE (SHADER, "Preparing shader effect of type '%s'", CLUTTER_NOTE (SHADER, "Preparing shader effect of type '%s'",
G_OBJECT_TYPE_NAME (meta)); G_OBJECT_TYPE_NAME (meta));
priv->program = cogl_create_program ();
switch (priv->shader_type)
{
case CLUTTER_FRAGMENT_SHADER:
priv->shader = cogl_create_shader (COGL_SHADER_TYPE_FRAGMENT);
break;
case CLUTTER_VERTEX_SHADER:
priv->shader = cogl_create_shader (COGL_SHADER_TYPE_VERTEX);
break;
default:
priv->shader = COGL_INVALID_HANDLE;
break;
}
g_assert (priv->shader != COGL_INVALID_HANDLE);
} }
static void static void
@ -844,8 +822,26 @@ clutter_shader_effect_set_shader_source (ClutterShaderEffect *effect,
if (priv->source_set) if (priv->source_set)
return TRUE; return TRUE;
if (priv->program == COGL_INVALID_HANDLE)
priv->program = cogl_create_program ();
if (priv->shader == COGL_INVALID_HANDLE) if (priv->shader == COGL_INVALID_HANDLE)
return FALSE; switch (priv->shader_type)
{
case CLUTTER_FRAGMENT_SHADER:
priv->shader = cogl_create_shader (COGL_SHADER_TYPE_FRAGMENT);
break;
case CLUTTER_VERTEX_SHADER:
priv->shader = cogl_create_shader (COGL_SHADER_TYPE_VERTEX);
break;
default:
priv->shader = COGL_INVALID_HANDLE;
break;
}
g_assert (priv->shader != COGL_INVALID_HANDLE);
cogl_shader_source (priv->shader, source); cogl_shader_source (priv->shader, source);