diff --git a/clutter/clutter/clutter-blur-effect.c b/clutter/clutter/clutter-blur-effect.c index d3e7ddca6..33aa201bc 100644 --- a/clutter/clutter/clutter-blur-effect.c +++ b/clutter/clutter/clutter-blur-effect.c @@ -122,29 +122,6 @@ clutter_blur_effect_create_pipeline (ClutterOffscreenEffect *effect, return cogl_object_ref (blur_effect->pipeline); } -static gboolean -clutter_blur_effect_pre_paint (ClutterEffect *effect, - ClutterPaintNode *node, - ClutterPaintContext *paint_context) -{ - ClutterEffectClass *parent_class; - - if (!clutter_feature_available (CLUTTER_FEATURE_SHADERS_GLSL)) - { - /* if we don't have support for GLSL shaders then we - * forcibly disable the ActorMeta - */ - g_warning ("Unable to use the ShaderEffect: the graphics hardware " - "or the current GL driver does not implement support " - "for the GLSL shading language."); - clutter_actor_meta_set_enabled (CLUTTER_ACTOR_META (effect), FALSE); - return FALSE; - } - - parent_class = CLUTTER_EFFECT_CLASS (clutter_blur_effect_parent_class); - return parent_class->pre_paint (effect, node, paint_context); -} - static gboolean clutter_blur_effect_modify_paint_volume (ClutterEffect *effect, ClutterPaintVolume *volume) @@ -190,7 +167,6 @@ clutter_blur_effect_class_init (ClutterBlurEffectClass *klass) gobject_class->dispose = clutter_blur_effect_dispose; - effect_class->pre_paint = clutter_blur_effect_pre_paint; effect_class->modify_paint_volume = clutter_blur_effect_modify_paint_volume; offscreen_class = CLUTTER_OFFSCREEN_EFFECT_CLASS (klass); diff --git a/clutter/clutter/clutter-brightness-contrast-effect.c b/clutter/clutter/clutter-brightness-contrast-effect.c index 4f0ce2e5e..7b7fdd183 100644 --- a/clutter/clutter/clutter-brightness-contrast-effect.c +++ b/clutter/clutter/clutter-brightness-contrast-effect.c @@ -147,19 +147,6 @@ clutter_brightness_contrast_effect_pre_paint (ClutterEffect *effect, if (will_have_no_effect (self)) return FALSE; - if (!clutter_feature_available (CLUTTER_FEATURE_SHADERS_GLSL)) - { - /* if we don't have support for GLSL shaders then we - * forcibly disable the ActorMeta - */ - g_warning ("Unable to use the ClutterBrightnessContrastEffect: the " - "graphics hardware or the current GL driver does not " - "implement support for the GLSL shading language. The " - "effect will be disabled."); - clutter_actor_meta_set_enabled (CLUTTER_ACTOR_META (effect), FALSE); - return FALSE; - } - parent_class = CLUTTER_EFFECT_CLASS (clutter_brightness_contrast_effect_parent_class); diff --git a/clutter/clutter/clutter-colorize-effect.c b/clutter/clutter/clutter-colorize-effect.c index 6f7de95bd..50ac90a67 100644 --- a/clutter/clutter/clutter-colorize-effect.c +++ b/clutter/clutter/clutter-colorize-effect.c @@ -110,29 +110,6 @@ clutter_colorize_effect_create_pipeline (ClutterOffscreenEffect *effect, return cogl_object_ref (colorize_effect->pipeline); } -static gboolean -clutter_colorize_effect_pre_paint (ClutterEffect *effect, - ClutterPaintNode *node, - ClutterPaintContext *paint_context) -{ - ClutterEffectClass *parent_class; - - if (!clutter_feature_available (CLUTTER_FEATURE_SHADERS_GLSL)) - { - /* if we don't have support for GLSL shaders then we - * forcibly disable the ActorMeta - */ - g_warning ("Unable to use the ShaderEffect: the graphics hardware " - "or the current GL driver does not implement support " - "for the GLSL shading language."); - clutter_actor_meta_set_enabled (CLUTTER_ACTOR_META (effect), FALSE); - return FALSE; - } - - parent_class = CLUTTER_EFFECT_CLASS (clutter_colorize_effect_parent_class); - return parent_class->pre_paint (effect, node, paint_context); -} - static void clutter_colorize_effect_dispose (GObject *gobject) { @@ -191,15 +168,12 @@ clutter_colorize_effect_get_property (GObject *gobject, static void clutter_colorize_effect_class_init (ClutterColorizeEffectClass *klass) { - ClutterEffectClass *effect_class = CLUTTER_EFFECT_CLASS (klass); GObjectClass *gobject_class = G_OBJECT_CLASS (klass); ClutterOffscreenEffectClass *offscreen_class; offscreen_class = CLUTTER_OFFSCREEN_EFFECT_CLASS (klass); offscreen_class->create_pipeline = clutter_colorize_effect_create_pipeline; - effect_class->pre_paint = clutter_colorize_effect_pre_paint; - gobject_class->set_property = clutter_colorize_effect_set_property; gobject_class->get_property = clutter_colorize_effect_get_property; gobject_class->dispose = clutter_colorize_effect_dispose; diff --git a/clutter/clutter/clutter-desaturate-effect.c b/clutter/clutter/clutter-desaturate-effect.c index 5dbf04371..16824782f 100644 --- a/clutter/clutter/clutter-desaturate-effect.c +++ b/clutter/clutter/clutter-desaturate-effect.c @@ -121,29 +121,6 @@ clutter_desaturate_effect_create_pipeline (ClutterOffscreenEffect *effect, return cogl_object_ref (desaturate_effect->pipeline); } -static gboolean -clutter_desaturate_effect_pre_paint (ClutterEffect *effect, - ClutterPaintNode *node, - ClutterPaintContext *paint_context) -{ - ClutterEffectClass *parent_class; - - if (!clutter_feature_available (CLUTTER_FEATURE_SHADERS_GLSL)) - { - /* if we don't have support for GLSL shaders then we - * forcibly disable the ActorMeta - */ - g_warning ("Unable to use the ShaderEffect: the graphics hardware " - "or the current GL driver does not implement support " - "for the GLSL shading language."); - clutter_actor_meta_set_enabled (CLUTTER_ACTOR_META (effect), FALSE); - return FALSE; - } - - parent_class = CLUTTER_EFFECT_CLASS (clutter_desaturate_effect_parent_class); - return parent_class->pre_paint (effect, node, paint_context); -} - static void clutter_desaturate_effect_dispose (GObject *gobject) { @@ -211,15 +188,12 @@ update_factor_uniform (ClutterDesaturateEffect *self) static void clutter_desaturate_effect_class_init (ClutterDesaturateEffectClass *klass) { - ClutterEffectClass *effect_class = CLUTTER_EFFECT_CLASS (klass); GObjectClass *gobject_class = G_OBJECT_CLASS (klass); ClutterOffscreenEffectClass *offscreen_class; offscreen_class = CLUTTER_OFFSCREEN_EFFECT_CLASS (klass); offscreen_class->create_pipeline = clutter_desaturate_effect_create_pipeline; - effect_class->pre_paint = clutter_desaturate_effect_pre_paint; - /** * ClutterDesaturateEffect:factor: * diff --git a/clutter/clutter/clutter-shader-effect.c b/clutter/clutter/clutter-shader-effect.c index 4c9c866c9..a23480567 100644 --- a/clutter/clutter/clutter-shader-effect.c +++ b/clutter/clutter/clutter-shader-effect.c @@ -292,18 +292,6 @@ clutter_shader_effect_set_actor (ClutterActorMeta *meta, ClutterShaderEffectPrivate *priv = self->priv; ClutterActorMetaClass *parent; - if (!clutter_feature_available (CLUTTER_FEATURE_SHADERS_GLSL)) - { - /* if we don't have support for GLSL shaders then we - * forcibly disable the ActorMeta - */ - g_warning ("Unable to use the ShaderEffect: the graphics hardware " - "or the current GL driver does not implement support " - "for the GLSL shading language."); - clutter_actor_meta_set_enabled (meta, FALSE); - return; - } - parent = CLUTTER_ACTOR_META_CLASS (clutter_shader_effect_parent_class); parent->set_actor (meta, actor); diff --git a/src/compositor/meta-background-content.c b/src/compositor/meta-background-content.c index 49f5885ca..2e8c923b4 100644 --- a/src/compositor/meta-background-content.c +++ b/src/compositor/meta-background-content.c @@ -400,11 +400,11 @@ setup_pipeline (MetaBackgroundContent *self, opacity = clutter_actor_get_paint_opacity (actor); if (opacity < 255) pipeline_flags |= PIPELINE_BLEND; - if (self->vignette && clutter_feature_available (CLUTTER_FEATURE_SHADERS_GLSL)) + if (self->vignette) pipeline_flags |= PIPELINE_VIGNETTE; - if (self->gradient && clutter_feature_available (CLUTTER_FEATURE_SHADERS_GLSL)) + if (self->gradient) pipeline_flags |= PIPELINE_GRADIENT; - if (self->has_rounded_clip && clutter_feature_available (CLUTTER_FEATURE_SHADERS_GLSL)) + if (self->has_rounded_clip) pipeline_flags |= PIPELINE_ROUNDED_CLIP | PIPELINE_BLEND; if (pipeline_flags != self->pipeline_flags) @@ -532,22 +532,9 @@ setup_pipeline (MetaBackgroundContent *self, } if (self->vignette) - { - color_component = self->vignette_brightness * opacity / 255.; - - if (!clutter_feature_available (CLUTTER_FEATURE_SHADERS_GLSL)) - { - /* Darken everything to match the average brightness that would - * be there if we were drawing the vignette, which is - * (1 - (pi/12.) * vignette_sharpness) [exercise for the reader :] - */ - color_component *= (1 - 0.74 * self->vignette_sharpness); - } - } + color_component = self->vignette_brightness * opacity / 255.; else - { - color_component = opacity / 255.; - } + color_component = opacity / 255.; cogl_pipeline_set_color4f (self->pipeline, color_component, diff --git a/src/tests/clutter/conform/actor-pick.c b/src/tests/clutter/conform/actor-pick.c index 011acec4a..af4ad6f95 100644 --- a/src/tests/clutter/conform/actor-pick.c +++ b/src/tests/clutter/conform/actor-pick.c @@ -92,9 +92,6 @@ on_timeout (gpointer data) } else if (test_num == 3) { - if (!clutter_feature_available (CLUTTER_FEATURE_SHADERS_GLSL)) - continue; - clutter_actor_hide (over_actor); clutter_actor_add_effect_with_name (CLUTTER_ACTOR (state->stage), diff --git a/src/tests/clutter/conform/actor-shader-effect.c b/src/tests/clutter/conform/actor-shader-effect.c index a22ae5f99..869fa7683 100644 --- a/src/tests/clutter/conform/actor-shader-effect.c +++ b/src/tests/clutter/conform/actor-shader-effect.c @@ -259,9 +259,6 @@ actor_shader_effect (void) gboolean was_painted; GList *actors = NULL; - if (!clutter_feature_available (CLUTTER_FEATURE_SHADERS_GLSL)) - return; - stage = clutter_test_get_stage (); rect = make_actor (foo_old_shader_effect_get_type ());