diff options
author | Emmanuele Bassi <ebassi@linux.intel.com> | 2012-02-14 17:14:25 +0000 |
---|---|---|
committer | Emmanuele Bassi <ebassi@linux.intel.com> | 2012-02-14 17:14:25 +0000 |
commit | c1a57e537b07e0036cec491044d92b5becdbc4b8 (patch) | |
tree | 77795efee12c94453de115813718700ba819686a /clutter/clutter-blur-effect.c | |
parent | 553f446315f6d6122fd75277e4fde1d9526532f5 (diff) | |
download | clutter-c1a57e537b07e0036cec491044d92b5becdbc4b8.tar.gz |
Do not check for features inside class initialization
The class initialization function may be called when Clutter hasn't been
fully initialized — for instance, when scanning the source with gtk-doc
or with the introspection scanner.
Diffstat (limited to 'clutter/clutter-blur-effect.c')
-rw-r--r-- | clutter/clutter-blur-effect.c | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/clutter/clutter-blur-effect.c b/clutter/clutter-blur-effect.c index a7a7c09f7..bed7360d4 100644 --- a/clutter/clutter-blur-effect.c +++ b/clutter/clutter-blur-effect.c @@ -221,6 +221,7 @@ clutter_blur_effect_class_init (ClutterBlurEffectClass *klass) ClutterEffectClass *effect_class = CLUTTER_EFFECT_CLASS (klass); GObjectClass *gobject_class = G_OBJECT_CLASS (klass); ClutterOffscreenEffectClass *offscreen_class; + CoglSnippet *snippet; gobject_class->dispose = clutter_blur_effect_dispose; @@ -232,18 +233,12 @@ clutter_blur_effect_class_init (ClutterBlurEffectClass *klass) klass->base_pipeline = cogl_pipeline_new (); - if (clutter_feature_available (CLUTTER_FEATURE_SHADERS_GLSL)) - { - CoglSnippet *snippet; - - snippet = cogl_snippet_new (COGL_SNIPPET_HOOK_TEXTURE_LOOKUP, - box_blur_glsl_declarations, - NULL); - cogl_snippet_set_replace (snippet, - box_blur_glsl_shader); - cogl_pipeline_add_layer_snippet (klass->base_pipeline, 0, snippet); - cogl_object_unref (snippet); - } + snippet = cogl_snippet_new (COGL_SNIPPET_HOOK_TEXTURE_LOOKUP, + box_blur_glsl_declarations, + NULL); + cogl_snippet_set_replace (snippet, box_blur_glsl_shader); + cogl_pipeline_add_layer_snippet (klass->base_pipeline, 0, snippet); + cogl_object_unref (snippet); cogl_pipeline_set_layer_null_texture (klass->base_pipeline, 0, /* layer number */ |