From a26119b5514655df5accd2f65cb0ee3ed242b4ea Mon Sep 17 00:00:00 2001 From: Robert Bragg Date: Wed, 11 Aug 2010 19:39:41 +0100 Subject: [PATCH] tests: Remove use of cogl_program_use The removes the use of cogl_program_use which has been deprecated and instead of using the cogl_program_uniform functions we now use the cogl_program_set_uniform methods. --- tests/interactive/test-cogl-shader-arbfp.c | 5 +---- tests/interactive/test-cogl-shader-glsl.c | 17 ++++++----------- 2 files changed, 7 insertions(+), 15 deletions(-) diff --git a/tests/interactive/test-cogl-shader-arbfp.c b/tests/interactive/test-cogl-shader-arbfp.c index 20ac90d73..7c1cfd7b8 100644 --- a/tests/interactive/test-cogl-shader-arbfp.c +++ b/tests/interactive/test-cogl-shader-arbfp.c @@ -270,10 +270,7 @@ set_shader_num (int new_no) param0[3] = -1.9; /* contrast */ uniform_no = cogl_program_get_uniform_location (program, "program.local[0]"); - /* Shesh this API is really F'ugly! */ - cogl_program_use (program); - cogl_program_uniform_float (uniform_no, 4, 1, param0); - cogl_program_use (COGL_INVALID_HANDLE); + cogl_program_set_uniform_float (program, uniform_no, 4, 1, param0); cogl_material_set_user_program (material, program); cogl_handle_unref (program); diff --git a/tests/interactive/test-cogl-shader-glsl.c b/tests/interactive/test-cogl-shader-glsl.c index 786a3ba5e..335642d48 100644 --- a/tests/interactive/test-cogl-shader-glsl.c +++ b/tests/interactive/test-cogl-shader-glsl.c @@ -234,24 +234,19 @@ set_shader_num (int new_no) cogl_handle_unref (shader); cogl_program_link (program); - /* Shesh this API is really F'ugly! */ - cogl_program_use (program); - uniform_no = cogl_program_get_uniform_location (program, "tex"); - cogl_program_uniform_1i (uniform_no, 0); + cogl_program_set_uniform_1i (program, uniform_no, 0); uniform_no = cogl_program_get_uniform_location (program, "radius"); - cogl_program_uniform_1f (uniform_no, 3.0); + cogl_program_set_uniform_1f (program, uniform_no, 3.0); uniform_no = cogl_program_get_uniform_location (program, "brightness"); - cogl_program_uniform_1f (uniform_no, 0.4); + cogl_program_set_uniform_1f (program, uniform_no, 0.4); uniform_no = cogl_program_get_uniform_location (program, "contrast"); - cogl_program_uniform_1f (uniform_no, -1.9); + cogl_program_set_uniform_1f (program, uniform_no, -1.9); uniform_no = cogl_program_get_uniform_location (program, "x_step"); - cogl_program_uniform_1f (uniform_no, 1.0f / image_width); + cogl_program_set_uniform_1f (program, uniform_no, 1.0f / image_width); uniform_no = cogl_program_get_uniform_location (program, "y_step"); - cogl_program_uniform_1f (uniform_no, 1.0f / image_height); - - cogl_program_use (COGL_INVALID_HANDLE); + cogl_program_set_uniform_1f (program, uniform_no, 1.0f / image_height); cogl_material_set_user_program (material, program); cogl_handle_unref (program);