From c3354cb2c0acc7d80b2cea3f970a1d83a47d585c Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Mon, 15 Feb 2010 11:56:34 +0000 Subject: [PATCH] conform: Do not use deprecated API There is no more type-specific ref/unref pairs: it is all under CoglHandle now. --- tests/conform/test-cogl-blend-strings.c | 6 +++--- tests/conform/test-cogl-multitexture.c | 2 +- tests/conform/test-cogl-texture-mipmaps.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/conform/test-cogl-blend-strings.c b/tests/conform/test-cogl-blend-strings.c index d65c809..8b9647f 100644 --- a/tests/conform/test-cogl-blend-strings.c +++ b/tests/conform/test-cogl-blend-strings.c @@ -94,7 +94,7 @@ test_blend (TestState *state, y * QUAD_WIDTH, x * QUAD_WIDTH + QUAD_WIDTH, y * QUAD_WIDTH + QUAD_WIDTH); - cogl_material_unref (material); + cogl_handle_unref (material); /* * Now blend a rectangle over our well defined destination: @@ -120,7 +120,7 @@ test_blend (TestState *state, y * QUAD_WIDTH, x * QUAD_WIDTH + QUAD_WIDTH, y * QUAD_WIDTH + QUAD_WIDTH); - cogl_material_unref (material); + cogl_handle_unref (material); /* See what we got... */ @@ -247,8 +247,8 @@ test_tex_combine (TestState *state, y * QUAD_WIDTH, x * QUAD_WIDTH + QUAD_WIDTH, y * QUAD_WIDTH + QUAD_WIDTH); - cogl_material_unref (material); + cogl_handle_unref (material); cogl_handle_unref (tex0); cogl_handle_unref (tex1); diff --git a/tests/conform/test-cogl-multitexture.c b/tests/conform/test-cogl-multitexture.c index 367368a..acbc3e8 100644 --- a/tests/conform/test-cogl-multitexture.c +++ b/tests/conform/test-cogl-multitexture.c @@ -149,8 +149,8 @@ on_paint (ClutterActor *actor, TestState *state) cogl_set_source (material); cogl_rectangle_with_multitexture_coords (0, 0, QUAD_WIDTH, QUAD_WIDTH, tex_coords, 8); - cogl_material_unref (material); + cogl_handle_unref (material); cogl_handle_unref (tex0); cogl_handle_unref (tex1); diff --git a/tests/conform/test-cogl-texture-mipmaps.c b/tests/conform/test-cogl-texture-mipmaps.c index be1b893..e00a2d1 100644 --- a/tests/conform/test-cogl-texture-mipmaps.c +++ b/tests/conform/test-cogl-texture-mipmaps.c @@ -77,7 +77,7 @@ on_paint (ClutterActor *actor, TestState *state) COGL_MATERIAL_FILTER_NEAREST); cogl_rectangle (1, 0, 2, 1); - cogl_material_unref (material); + cogl_handle_unref (material); /* Read back the two pixels we rendered */ cogl_read_pixels (0, 0, 2, 1, -- 2.7.4