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.
This commit is contained in:
Neil Roberts 2010-11-30 22:28:38 +00:00
parent 7ea97b3eb7
commit c492db38e0

View File

@ -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,