isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-29 11:30:45 -05:00
Code Issues Packages Projects Releases Wiki Activity

shader-effect: Attach the program to the target material

Browse Source 
Instead of calling cogl_program_use() around the paint_target()
chain-up, we can use the newly added API in CoglMaterial to attach
user-defined shaders to the offscreen target material.
This commit is contained in:
Emmanuele Bassi 2010-08-11 13:58:29 +01:00
parent 304e7dd077
commit eb4dee46b7
1 changed files with 24 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -156,21 +156,20 @@ G_DEFINE_ABSTRACT_TYPE (ClutterShaderEffect,
CLUTTER_TYPE_OFFSCREEN_EFFECT); CLUTTER_TYPE_OFFSCREEN_EFFECT);
static inline void static inline void
clutter_shader_effect_clear (ClutterShaderEffect *effect, clutter_shader_effect_clear (ClutterShaderEffect *self,
gboolean reset_uniforms) gboolean reset_uniforms)
{ {
ClutterShaderEffectPrivate *priv = effect->priv; ClutterShaderEffectPrivate *priv = self->priv;
if (priv->shader != COGL_INVALID_HANDLE) if (priv->shader != COGL_INVALID_HANDLE && !priv->is_compiled)
{ cogl_handle_unref (priv->shader);
cogl_handle_unref (priv->shader);
priv->shader = COGL_INVALID_HANDLE;
}
if (priv->program != COGL_INVALID_HANDLE) if (priv->program != COGL_INVALID_HANDLE)
{ {
cogl_handle_unref (priv->program); cogl_handle_unref (priv->program);
priv->program = COGL_INVALID_HANDLE; priv->program = COGL_INVALID_HANDLE;
priv->shader = COGL_INVALID_HANDLE;
} }
if (reset_uniforms && priv->uniforms != NULL) if (reset_uniforms && priv->uniforms != NULL)
@ -215,6 +214,11 @@ clutter_shader_effect_update_uniforms (ClutterShaderEffect *effect)
if (priv->uniforms == NULL) if (priv->uniforms == NULL)
return; return;
/* XXX - we need to do this dance here because the cogl_program_uniform*
* family of functions do not take the program as a parameter
*/
cogl_program_use (priv->program);
key = value = NULL; key = value = NULL;
g_hash_table_iter_init (&iter, priv->uniforms); g_hash_table_iter_init (&iter, priv->uniforms);
while (g_hash_table_iter_next (&iter, &key, &value)) while (g_hash_table_iter_next (&iter, &key, &value))
@ -263,6 +267,8 @@ clutter_shader_effect_update_uniforms (ClutterShaderEffect *effect)
g_type_name (G_VALUE_TYPE (&uniform->value)), g_type_name (G_VALUE_TYPE (&uniform->value)),
uniform->name); uniform->name);
} }
cogl_program_use (COGL_INVALID_HANDLE);
} }
static void static void
@ -324,16 +330,17 @@ clutter_shader_effect_paint_target (ClutterOffscreenEffect *effect)
{ {
ClutterShaderEffectPrivate *priv = CLUTTER_SHADER_EFFECT (effect)->priv; ClutterShaderEffectPrivate *priv = CLUTTER_SHADER_EFFECT (effect)->priv;
ClutterOffscreenEffectClass *parent; ClutterOffscreenEffectClass *parent;
CoglHandle material;
/* we haven't been prepared or we don't have support for /* we haven't been prepared or we don't have support for
* GLSL shaders in Clutter * GLSL shaders in Clutter
*/ */
if (priv->program == COGL_INVALID_HANDLE || if (priv->program == COGL_INVALID_HANDLE ||
priv->shader == COGL_INVALID_HANDLE) priv->shader == COGL_INVALID_HANDLE)
return; goto out;
if (!priv->source_set) if (!priv->source_set)
return; goto out;
if (!priv->is_compiled) if (!priv->is_compiled)
{ {
@ -353,10 +360,12 @@ clutter_shader_effect_paint_target (ClutterOffscreenEffect *effect)
cogl_handle_unref (priv->program); cogl_handle_unref (priv->program);
priv->shader = COGL_INVALID_HANDLE; priv->shader = COGL_INVALID_HANDLE;
return; goto out;
} }
cogl_program_attach_shader (priv->program, priv->shader); cogl_program_attach_shader (priv->program, priv->shader);
cogl_handle_unref (priv->shader);
cogl_program_link (priv->program); cogl_program_link (priv->program);
priv->is_compiled = TRUE; priv->is_compiled = TRUE;
@ -365,17 +374,17 @@ clutter_shader_effect_paint_target (ClutterOffscreenEffect *effect)
CLUTTER_NOTE (SHADER, "Applying the shader effect of type '%s'", CLUTTER_NOTE (SHADER, "Applying the shader effect of type '%s'",
G_OBJECT_TYPE_NAME (effect)); G_OBJECT_TYPE_NAME (effect));
/* set the shader */
cogl_program_use (priv->program);
clutter_shader_effect_update_uniforms (CLUTTER_SHADER_EFFECT (effect)); clutter_shader_effect_update_uniforms (CLUTTER_SHADER_EFFECT (effect));
/* associate the program to the offscreen target material */
material = clutter_offscreen_effect_get_target (effect);
cogl_material_set_user_program (material, priv->program);
out:
/* paint the offscreen buffer */ /* paint the offscreen buffer */
parent = CLUTTER_OFFSCREEN_EFFECT_CLASS (clutter_shader_effect_parent_class); parent = CLUTTER_OFFSCREEN_EFFECT_CLASS (clutter_shader_effect_parent_class);
parent->paint_target (effect); parent->paint_target (effect);
/* unset the shader */
cogl_program_use (COGL_INVALID_HANDLE);
} }
static void static void