isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-12-24 12:02:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix comparing the uniforms state

Browse Source 
When comparing uniform values, it was not correctly handling the case
where pipeline0 has the value set but pipeline1 does not (only the
other way around) so it would crash.

Reviewed-by: Robert Bragg <robert@linux.intel.com>
This commit is contained in:
Neil Roberts 2011-11-17 16:35:23 +00:00
parent 80a9c3bb32
commit 9e52b4d714
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cogl/cogl-pipeline-state.c
View File

@ -321,11 +321,16 @@ _cogl_pipeline_uniforms_state_equal (CoglPipeline *authority0,
const CoglBoxedValue *value0 = values0[i]; const CoglBoxedValue *value0 = values0[i];
const CoglBoxedValue *value1 = values1[i]; const CoglBoxedValue *value1 = values1[i];
if (value0 == NULL || value0->type == COGL_BOXED_NONE) if (value0 == NULL)
{ {
if (value1 != NULL && value1->type != COGL_BOXED_NONE) if (value1 != NULL && value1->type != COGL_BOXED_NONE)
return FALSE; return FALSE;
} }
else if (value1 == NULL)
{
if (value0 != NULL && value0->type != COGL_BOXED_NONE)
return FALSE;
}
else if (!_cogl_boxed_value_equal (value0, value1)) else if (!_cogl_boxed_value_equal (value0, value1))
return FALSE; return FALSE;
} }