diff --git a/cogl/cogl/cogl-pipeline-layer-private.h b/cogl/cogl/cogl-pipeline-layer-private.h index 1246fa8c2..adde9bbf0 100644 --- a/cogl/cogl/cogl-pipeline-layer-private.h +++ b/cogl/cogl/cogl-pipeline-layer-private.h @@ -253,7 +253,7 @@ struct _CoglPipelineLayer }; typedef gboolean -(*CoglPipelineLayerStateComparitor) (CoglPipelineLayer *authority0, +(*CoglPipelineLayerStateComparator) (CoglPipelineLayer *authority0, CoglPipelineLayer *authority1); diff --git a/cogl/cogl/cogl-pipeline-layer.c b/cogl/cogl/cogl-pipeline-layer.c index a076c7e95..18d0140ab 100644 --- a/cogl/cogl/cogl-pipeline-layer.c +++ b/cogl/cogl/cogl-pipeline-layer.c @@ -575,9 +575,9 @@ static gboolean layer_state_equal (CoglPipelineLayerStateIndex state_index, CoglPipelineLayer **authorities0, CoglPipelineLayer **authorities1, - CoglPipelineLayerStateComparitor comparitor) + CoglPipelineLayerStateComparator comparator) { - return comparitor (authorities0[state_index], authorities1[state_index]); + return comparator (authorities0[state_index], authorities1[state_index]); } void diff --git a/cogl/cogl/cogl-pipeline-private.h b/cogl/cogl/cogl-pipeline-private.h index 2655089af..8369abca8 100644 --- a/cogl/cogl/cogl-pipeline-private.h +++ b/cogl/cogl/cogl-pipeline-private.h @@ -457,14 +457,14 @@ _cogl_pipeline_get_authority (CoglPipeline *pipeline, return authority; } -typedef gboolean (*CoglPipelineStateComparitor) (CoglPipeline *authority0, +typedef gboolean (*CoglPipelineStateComparator) (CoglPipeline *authority0, CoglPipeline *authority1); void _cogl_pipeline_update_authority (CoglPipeline *pipeline, CoglPipeline *authority, CoglPipelineState state, - CoglPipelineStateComparitor comparitor); + CoglPipelineStateComparator comparator); void _cogl_pipeline_pre_change_notify (CoglPipeline *pipeline, diff --git a/cogl/cogl/cogl-pipeline.c b/cogl/cogl/cogl-pipeline.c index f9489448a..27947adc8 100644 --- a/cogl/cogl/cogl-pipeline.c +++ b/cogl/cogl/cogl-pipeline.c @@ -2206,7 +2206,7 @@ void _cogl_pipeline_update_authority (CoglPipeline *pipeline, CoglPipeline *authority, CoglPipelineState state, - CoglPipelineStateComparitor comparitor) + CoglPipelineStateComparator comparator) { /* If we are the current authority see if we can revert to one of * our ancestors being the authority */ @@ -2217,7 +2217,7 @@ _cogl_pipeline_update_authority (CoglPipeline *pipeline, CoglPipeline *old_authority = _cogl_pipeline_get_authority (parent, state); - if (comparitor (authority, old_authority)) + if (comparator (authority, old_authority)) pipeline->differences &= ~state; } else if (pipeline != authority)