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

pipeline: fix for _init_multi_property_sparse_state

Browse Source 
When copying COMBINE state in
_cogl_pipeline_layer_init_multi_property_sparse_state we would read some
state from the destination layer (invalid data potentially), then
redundantly set the value back on the destination. This was picked up by
valgrind, and the code is now more careful about how it references the
src layer vs the destination layer.
This commit is contained in:
Robert Bragg 2011-01-24 18:42:28 +00:00
parent 325c620f81
commit dc56d908ed
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
cogl/cogl-pipeline.c
View File

@ -1745,28 +1745,29 @@ _cogl_pipeline_layer_init_multi_property_sparse_state (
{ {
int n_args; int n_args;
int i; int i;
CoglPipelineLayerBigState *big_state = layer->big_state; CoglPipelineLayerBigState *src_big_state = authority->big_state;
GLint func = big_state->texture_combine_rgb_func; CoglPipelineLayerBigState *dest_big_state = layer->big_state;
GLint func = src_big_state->texture_combine_rgb_func;
big_state->texture_combine_rgb_func = func; dest_big_state->texture_combine_rgb_func = func;
n_args = _cogl_get_n_args_for_combine_func (func); n_args = _cogl_get_n_args_for_combine_func (func);
for (i = 0; i < n_args; i++) for (i = 0; i < n_args; i++)
{ {
big_state->texture_combine_rgb_src[i] = dest_big_state->texture_combine_rgb_src[i] =
authority->big_state->texture_combine_rgb_src[i]; src_big_state->texture_combine_rgb_src[i];
big_state->texture_combine_rgb_op[i] = dest_big_state->texture_combine_rgb_op[i] =
authority->big_state->texture_combine_rgb_op[i]; src_big_state->texture_combine_rgb_op[i];
} }
func = authority->big_state->texture_combine_alpha_func; func = src_big_state->texture_combine_alpha_func;
big_state->texture_combine_alpha_func = func; dest_big_state->texture_combine_alpha_func = func;
n_args = _cogl_get_n_args_for_combine_func (func); n_args = _cogl_get_n_args_for_combine_func (func);
for (i = 0; i < n_args; i++) for (i = 0; i < n_args; i++)
{ {
big_state->texture_combine_alpha_src[i] = dest_big_state->texture_combine_alpha_src[i] =
authority->big_state->texture_combine_alpha_src[i]; src_big_state->texture_combine_alpha_src[i];
big_state->texture_combine_alpha_op[i] = dest_big_state->texture_combine_alpha_op[i] =
authority->big_state->texture_combine_alpha_op[i]; src_big_state->texture_combine_alpha_op[i];
} }
break; break;
} }