brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove last uses of cogl_program_uniform*

Browse Source 
Following the commits:

  c03544da - clutter-shader: use cogl_program_set_uniform_xyz API
  a26119b5 - tests: Remove use of cogl_program_use

Remove the users of cogl_program_uniform_* and cogl_program_use() in the
shader-based effects.
This commit is contained in:
Emmanuele Bassi
2010-08-12 17:06:29 +01:00
parent e016a62ab0
commit daf6e73936
4 changed files with 34 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
clutter/clutter-colorize-effect.c
View File

@ -200,10 +200,8 @@ clutter_colorize_effect_paint_target (ClutterOffscreenEffect *effect)
if (self->program == COGL_INVALID_HANDLE)
goto out;
cogl_program_use (self->program);
if (self->tex_uniform > -1)
cogl_program_uniform_1i (self->tex_uniform, 0);
cogl_program_set_uniform_1i (self->program, self->tex_uniform, 0);
if (self->tint_uniform > -1)
{
@ -213,11 +211,11 @@ clutter_colorize_effect_paint_target (ClutterOffscreenEffect *effect)
self->tint.blue / 255.0
};
cogl_program_uniform_float (self->tint_uniform, 3, 1, tint);
cogl_program_set_uniform_float (self->program, self->tint_uniform,
3, 1,
tint);
}
cogl_program_use (COGL_INVALID_HANDLE);
material = clutter_offscreen_effect_get_target (effect);
cogl_material_set_user_program (material, self->program);