summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEmmanuele Bassi <ebassi@gnome.org>2011-11-22 01:00:58 +0000
committerEmmanuele Bassi <ebassi@gnome.org>2011-11-22 01:01:37 +0000
commita24ff882b6dd9eb3ab0a7cfdbb047b84a1bc5893 (patch)
tree656af8fef40eb9ff09403d3e898271c55c123111
parent52ea1510a19233413a37801e1a72832027fcc548 (diff)
downloadclutter-a24ff882b6dd9eb3ab0a7cfdbb047b84a1bc5893.tar.gz
conform: Bail out GLSL-based tests
If we don't have GLSL support on the platform.
-rw-r--r--tests/conform/test-pick.c6
-rw-r--r--tests/conform/test-shader-effect.c3
2 files changed, 9 insertions, 0 deletions
diff --git a/tests/conform/test-pick.c b/tests/conform/test-pick.c
index affef2866..946033ac8 100644
--- a/tests/conform/test-pick.c
+++ b/tests/conform/test-pick.c
@@ -142,6 +142,9 @@ on_timeout (State *state)
}
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),
@@ -153,6 +156,9 @@ on_timeout (State *state)
}
else if (test_num == 4)
{
+ if (!clutter_feature_available (CLUTTER_FEATURE_SHADERS_GLSL))
+ continue;
+
clutter_actor_hide (over_actor);
clutter_actor_remove_effect_by_name (CLUTTER_ACTOR (state->stage),
"blur");
diff --git a/tests/conform/test-shader-effect.c b/tests/conform/test-shader-effect.c
index a21db610f..bafcbe5e2 100644
--- a/tests/conform/test-shader-effect.c
+++ b/tests/conform/test-shader-effect.c
@@ -239,6 +239,9 @@ test_shader_effect (TestConformSimpleFixture *fixture,
ClutterActor *stage;
ClutterActor *rect;
+ if (!clutter_feature_available (CLUTTER_FEATURE_SHADERS_GLSL))
+ return;
+
stage = clutter_stage_new ();
rect = make_actor (foo_old_shader_effect_get_type ());