From a38fa7a2dfc3a169777ba172d145178b9b068d73 Mon Sep 17 00:00:00 2001 From: Neil Roberts Date: Tue, 30 Nov 2010 22:28:38 +0000 Subject: [PATCH] cogl-pipeline-fixed: Use the correct state flag for combine constant The fixed pipeline backend wasn't correctly flushing the combine constant because it was using the wrong flag to determine if the combine constant has changed since the last flushed material. --- clutter/cogl/cogl/cogl-pipeline-fixed.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/clutter/cogl/cogl/cogl-pipeline-fixed.c b/clutter/cogl/cogl/cogl-pipeline-fixed.c index 80e77ef76..43b71fce8 100644 --- a/clutter/cogl/cogl/cogl-pipeline-fixed.c +++ b/clutter/cogl/cogl/cogl-pipeline-fixed.c @@ -174,11 +174,11 @@ _cogl_pipeline_backend_fixed_add_layer (CoglPipeline *pipeline, } } - if (layers_difference & COGL_PIPELINE_LAYER_STATE_COMBINE) + if (layers_difference & COGL_PIPELINE_LAYER_STATE_COMBINE_CONSTANT) { CoglPipelineLayer *authority = - _cogl_pipeline_layer_get_authority (layer, - COGL_PIPELINE_LAYER_STATE_COMBINE); + _cogl_pipeline_layer_get_authority + (layer, COGL_PIPELINE_LAYER_STATE_COMBINE_CONSTANT); CoglPipelineLayerBigState *big_state = authority->big_state; GE (glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR,