[clutter] conform: Bail out GLSL-based tests
- From: Emmanuele Bassi <ebassi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [clutter] conform: Bail out GLSL-based tests
- Date: Tue, 22 Nov 2011 01:21:09 +0000 (UTC)
commit a24ff882b6dd9eb3ab0a7cfdbb047b84a1bc5893
Author: Emmanuele Bassi <ebassi gnome org>
Date: Tue Nov 22 01:00:58 2011 +0000
conform: Bail out GLSL-based tests
If we don't have GLSL support on the platform.
tests/conform/test-pick.c | 6 ++++++
tests/conform/test-shader-effect.c | 3 +++
2 files changed, 9 insertions(+), 0 deletions(-)
---
diff --git a/tests/conform/test-pick.c b/tests/conform/test-pick.c
index affef28..946033a 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 a21db61..bafcbe5 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 ());
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]