mirror of
https://github.com/brl/mutter.git
synced 2025-02-18 14:14:10 +00:00
* tests/conform/test-mesh-mutability.c:
* tests/conform/test-mesh-interleved.c: * tests/conform/test-mesh-contiguous.c: Remove the idle source after the test is complete so that it won't interfere with other tests.
This commit is contained in:
parent
dfa730909c
commit
1cbafc99d6
@ -1,3 +1,11 @@
|
|||||||
|
2008-11-28 Neil Roberts <neil@linux.intel.com>
|
||||||
|
|
||||||
|
* tests/conform/test-mesh-mutability.c:
|
||||||
|
* tests/conform/test-mesh-interleved.c:
|
||||||
|
* tests/conform/test-mesh-contiguous.c: Remove the idle source
|
||||||
|
after the test is complete so that it won't interfere with other
|
||||||
|
tests.
|
||||||
|
|
||||||
2008-11-26 Emmanuele Bassi <ebassi@linux.intel.com>
|
2008-11-26 Emmanuele Bassi <ebassi@linux.intel.com>
|
||||||
|
|
||||||
* clutter/clutter-group.c:
|
* clutter/clutter-group.c:
|
||||||
|
@ -128,6 +128,7 @@ test_mesh_contiguous (TestConformSimpleFixture *fixture,
|
|||||||
ClutterActor *stage;
|
ClutterActor *stage;
|
||||||
ClutterColor stage_clr = {0x0, 0x0, 0x0, 0xff};
|
ClutterColor stage_clr = {0x0, 0x0, 0x0, 0xff};
|
||||||
ClutterActor *group;
|
ClutterActor *group;
|
||||||
|
guint idle_source;
|
||||||
|
|
||||||
state.frame = 0;
|
state.frame = 0;
|
||||||
|
|
||||||
@ -145,7 +146,7 @@ test_mesh_contiguous (TestConformSimpleFixture *fixture,
|
|||||||
/* We force continuous redrawing of the stage, since we need to skip
|
/* We force continuous redrawing of the stage, since we need to skip
|
||||||
* the first few frames, and we wont be doing anything else that
|
* the first few frames, and we wont be doing anything else that
|
||||||
* will trigger redrawing. */
|
* will trigger redrawing. */
|
||||||
g_idle_add (queue_redraw, stage);
|
idle_source = g_idle_add (queue_redraw, stage);
|
||||||
|
|
||||||
g_signal_connect (group, "paint", G_CALLBACK (on_paint), &state);
|
g_signal_connect (group, "paint", G_CALLBACK (on_paint), &state);
|
||||||
|
|
||||||
@ -186,6 +187,8 @@ test_mesh_contiguous (TestConformSimpleFixture *fixture,
|
|||||||
|
|
||||||
cogl_mesh_unref (state.mesh);
|
cogl_mesh_unref (state.mesh);
|
||||||
|
|
||||||
|
g_source_remove (idle_source);
|
||||||
|
|
||||||
if (g_test_verbose ())
|
if (g_test_verbose ())
|
||||||
g_print ("OK\n");
|
g_print ("OK\n");
|
||||||
}
|
}
|
||||||
|
@ -99,6 +99,7 @@ test_mesh_interleved (TestConformSimpleFixture *fixture,
|
|||||||
ClutterActor *stage;
|
ClutterActor *stage;
|
||||||
ClutterColor stage_clr = {0x0, 0x0, 0x0, 0xff};
|
ClutterColor stage_clr = {0x0, 0x0, 0x0, 0xff};
|
||||||
ClutterActor *group;
|
ClutterActor *group;
|
||||||
|
guint idle_source;
|
||||||
|
|
||||||
state.frame = 0;
|
state.frame = 0;
|
||||||
|
|
||||||
@ -116,7 +117,7 @@ test_mesh_interleved (TestConformSimpleFixture *fixture,
|
|||||||
/* We force continuous redrawing of the stage, since we need to skip
|
/* We force continuous redrawing of the stage, since we need to skip
|
||||||
* the first few frames, and we wont be doing anything else that
|
* the first few frames, and we wont be doing anything else that
|
||||||
* will trigger redrawing. */
|
* will trigger redrawing. */
|
||||||
g_idle_add (queue_redraw, stage);
|
idle_source = g_idle_add (queue_redraw, stage);
|
||||||
|
|
||||||
g_signal_connect (group, "paint", G_CALLBACK (on_paint), &state);
|
g_signal_connect (group, "paint", G_CALLBACK (on_paint), &state);
|
||||||
|
|
||||||
@ -164,6 +165,8 @@ test_mesh_interleved (TestConformSimpleFixture *fixture,
|
|||||||
|
|
||||||
cogl_mesh_unref (state.mesh);
|
cogl_mesh_unref (state.mesh);
|
||||||
|
|
||||||
|
g_source_remove (idle_source);
|
||||||
|
|
||||||
if (g_test_verbose ())
|
if (g_test_verbose ())
|
||||||
g_print ("OK\n");
|
g_print ("OK\n");
|
||||||
}
|
}
|
||||||
|
@ -139,6 +139,7 @@ test_mesh_mutability (TestConformSimpleFixture *fixture,
|
|||||||
ClutterActor *stage;
|
ClutterActor *stage;
|
||||||
ClutterColor stage_clr = {0x0, 0x0, 0x0, 0xff};
|
ClutterColor stage_clr = {0x0, 0x0, 0x0, 0xff};
|
||||||
ClutterActor *group;
|
ClutterActor *group;
|
||||||
|
guint idle_source;
|
||||||
|
|
||||||
state.frame = 0;
|
state.frame = 0;
|
||||||
|
|
||||||
@ -156,7 +157,7 @@ test_mesh_mutability (TestConformSimpleFixture *fixture,
|
|||||||
/* We force continuous redrawing of the stage, since we need to skip
|
/* We force continuous redrawing of the stage, since we need to skip
|
||||||
* the first few frames, and we wont be doing anything else that
|
* the first few frames, and we wont be doing anything else that
|
||||||
* will trigger redrawing. */
|
* will trigger redrawing. */
|
||||||
g_idle_add (queue_redraw, stage);
|
idle_source = g_idle_add (queue_redraw, stage);
|
||||||
|
|
||||||
g_signal_connect (group, "paint", G_CALLBACK (on_paint), &state);
|
g_signal_connect (group, "paint", G_CALLBACK (on_paint), &state);
|
||||||
|
|
||||||
@ -197,6 +198,8 @@ test_mesh_mutability (TestConformSimpleFixture *fixture,
|
|||||||
|
|
||||||
cogl_mesh_unref (state.mesh);
|
cogl_mesh_unref (state.mesh);
|
||||||
|
|
||||||
|
g_source_remove (idle_source);
|
||||||
|
|
||||||
if (g_test_verbose ())
|
if (g_test_verbose ())
|
||||||
g_print ("OK\n");
|
g_print ("OK\n");
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user