isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-07-28 12:38:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

[fixed-to-float.sh] Apply the automatic changes to the tests as well

Browse Source 
Some of the tests are using the Cogl API so they should be updated to
float as well.

The patches have been updated to apply cleanly.
This commit is contained in:
Neil Roberts
2009-01-16 18:29:29 +00:00
parent 7a96ea9255
commit ae3615cfe3
3 changed files with 32 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
fixed-to-float-patches/remove_cogl_apis_taking_fixed_params.0.patch
View File

@@ -712,25 +712,24 @@ index dcd7c93..db4e16a 100644
<SUBSECTION>
cogl_color_get_red
diff --git a/tests/conform/test-backface-culling.c b/tests/conform/test-backface-culling.c
index 3b7948e..b22228b 100644
index 50c19fd..6303949 100644
--- a/tests/conform/test-backface-culling.c
+++ b/tests/conform/test-backface-culling.c
@@ -121,8 +121,7 @@ on_paint (ClutterActor *actor, TestState *state)
@@ -121,7 +121,7 @@ on_paint (ClutterActor *actor, TestState *state)
/* Set the color to white so that all the textures will be drawn
at their own color */
- cogl_set_source_color4x (COGL_FIXED_1, COGL_FIXED_1,
- COGL_FIXED_1, COGL_FIXED_1);
+ cogl_set_source_color4f (1.0f, 1.0f, 1.0f, 1.0f);
- cogl_set_source_color4x (1.0, 1.0,
+ cogl_set_source_color4f (1.0, 1.0,
1.0, 1.0);
x2 = x1 + COGL_FIXED_FROM_INT (TEXTURE_SIZE);
@@ -173,7 +172,7 @@ on_paint (ClutterActor *actor, TestState *state)
x2 = x1 + COGL_FIXED_FROM_INT (TEXTURE_SIZE);
x2 = x1 + (float)(TEXTURE_SIZE);
@@ -173,7 +173,7 @@ on_paint (ClutterActor *actor, TestState *state)
x2 = x1 + (float)(TEXTURE_SIZE);
/* Draw a regular rectangle (this should always show) */
- cogl_set_source_color4x (COGL_FIXED_1, 0, 0, COGL_FIXED_1);
+ cogl_set_source_color4f (1.0f, 0.0f, 0.0f, 1.0f);
cogl_rectangle (COGL_FIXED_TO_INT (x1), COGL_FIXED_TO_INT (y1),
COGL_FIXED_TO_INT (x2 - x1), COGL_FIXED_TO_INT (y2 - y1));
- cogl_set_source_color4x (1.0, 0, 0, 1.0);
+ cogl_set_source_color4f (1.0, 0, 0, 1.0);
cogl_rectangle ( (x1), (y1),
(x2 - x1), (y2 - y1));

25
fixed-to-float-patches/test-cogl-tex-tile.c.0.patch
View File

@@ -1,35 +1,24 @@
diff --git a/tests/interactive/test-cogl-tex-tile.c b/tests/interactive/test-cogl-tex-tile.c
index fe7138a..5be6dd5 100644
index 5063dff..177d60e 100644
--- a/tests/interactive/test-cogl-tex-tile.c
+++ b/tests/interactive/test-cogl-tex-tile.c
@@ -90,22 +90,22 @@ test_coglbox_paint(ClutterActor *self)
@@ -90,14 +90,14 @@ test_coglbox_paint(ClutterActor *self)
ClutterFixed sin_frame, cos_frame;
ClutterFixed frac_frame;
gint t;
- sin_frame = clutter_sini (CLUTTER_ANGLE_FROM_DEG (priv->frame));
- cos_frame = clutter_cosi (CLUTTER_ANGLE_FROM_DEG (priv->frame));
+ sin_frame = clutter_sinx (CLUTTER_INT_TO_FIXED (priv->frame));
+ cos_frame = clutter_cosx (CLUTTER_INT_TO_FIXED (priv->frame));
+ sin_frame = clutter_sinx (priv->frame);
+ cos_frame = clutter_cosx (priv->frame);
pingpong_frame = (priv->frame <= 180 ? priv->frame : 360 - priv->frame);
- frac_frame = COGL_FIXED_DIV (CLUTTER_INT_TO_FIXED (pingpong_frame),
frac_frame = (CLUTTER_INT_TO_FIXED (pingpong_frame) /
- CLUTTER_INT_TO_FIXED (180));
- frac_frame += (COGL_FIXED_1 >> 1);
- frac_frame += (1.0 >> 1);
- frac_frame <<= 1;
+ frac_frame = CLUTTER_FIXED_DIV (CLUTTER_INT_TO_FIXED (pingpong_frame),
+ CLUTTER_INT_TO_FIXED (180));
+ CLUTTER_INT_TO_FIXED (180));
+ frac_frame += 0.5;
+ frac_frame *= 2;
for (t=0; t<4; t+=2)
{
texcoords[t] += cos_frame;
texcoords[t+1] += sin_frame;
- texcoords[t] = COGL_FIXED_MUL (texcoords[t], frac_frame);
- texcoords[t+1] = COGL_FIXED_MUL (texcoords[t+1], frac_frame);
+ texcoords[t] = CLUTTER_FIXED_MUL (texcoords[t], frac_frame);
+ texcoords[t+1] = CLUTTER_FIXED_MUL (texcoords[t+1], frac_frame);
}
priv = TEST_COGLBOX_GET_PRIVATE (self);