isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-26 18:11:05 -05:00
Code Issues Packages Projects Releases Wiki Activity

material-arbfp: fix updating params if sharing progs

Browse Source 
If a single arbfp program is being shared between multiple CoglMaterials
then we need to make sure we update all program.local params when
switching between materials. Previously we had a dirty flag to track
when combine_constant params were changed but didn't take in to account
that different materials sharing the same program may have different
combine constants.
This commit is contained in:
Robert Bragg 2010-09-14 20:25:23 +01:00
parent d87522596d
commit 8cfb158f63
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
clutter/cogl/cogl/cogl-material-arbfp.c
View File

@ -980,6 +980,7 @@ _cogl_material_backend_arbfp_passthrough (CoglMaterial *material)
typedef struct _UpdateConstantsState typedef struct _UpdateConstantsState
{ {
int unit; int unit;
gboolean update_all;
ArbfpProgramState *arbfp_program_state; ArbfpProgramState *arbfp_program_state;
} UpdateConstantsState; } UpdateConstantsState;
@ -994,7 +995,7 @@ update_constants_cb (CoglMaterial *material,
_COGL_GET_CONTEXT (ctx, FALSE); _COGL_GET_CONTEXT (ctx, FALSE);
if (unit_state->dirty_combine_constant) if (state->update_all || unit_state->dirty_combine_constant)
{ {
float constant[4]; float constant[4];
_cogl_material_get_layer_combine_constant (material, _cogl_material_get_layer_combine_constant (material,
@ -1072,11 +1073,20 @@ _cogl_material_backend_arbfp_end (CoglMaterial *material,
UpdateConstantsState state; UpdateConstantsState state;
state.unit = 0; state.unit = 0;
state.arbfp_program_state = arbfp_program_state; state.arbfp_program_state = arbfp_program_state;
/* If this arbfp program was last used with a different material
* then we need to ensure we update all program.local params */
state.update_all =
material != arbfp_program_state->last_used_for_material;
cogl_material_foreach_layer (material, cogl_material_foreach_layer (material,
update_constants_cb, update_constants_cb,
&state); &state);
} }
/* We need to track what material used this arbfp program last since
* we will need to update program.local params when switching
* between different materials. */
arbfp_program_state->last_used_for_material = material;
return TRUE; return TRUE;
} }