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

cogl-pipeline-fixed: Use the correct state flag for combine constant

Browse Source 
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 499a370ee3
commit a38fa7a2df
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
clutter/cogl/cogl/cogl-pipeline-fixed.c
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 = CoglPipelineLayer *authority =
_cogl_pipeline_layer_get_authority (layer, _cogl_pipeline_layer_get_authority
COGL_PIPELINE_LAYER_STATE_COMBINE); (layer, COGL_PIPELINE_LAYER_STATE_COMBINE_CONSTANT);
CoglPipelineLayerBigState *big_state = authority->big_state; CoglPipelineLayerBigState *big_state = authority->big_state;
GE (glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, GE (glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR,