diff options
| author | Neil Roberts <neil@linux.intel.com> | 2010-11-30 22:40:32 +0000 |
|---|---|---|
| committer | Neil Roberts <neil@linux.intel.com> | 2010-11-30 22:45:13 +0000 |
| commit | a356c82b5dcc37b984033ecfedc0004bf6408627 (patch) | |
| tree | 60912b3bd3da79af81ede865536078056a798158 | |
| parent | ba4aa1b69be90e160b76ed7b0f6aed45114f35d7 (diff) | |
| download | clutter-a356c82b5dcc37b984033ecfedc0004bf6408627.tar.gz | |
cogl-pipeline: Add more ignored state changes for program generation
For shader generation backends we don't need to worry about changes to
the texture object and changing the user matrix. The missing user
matrix flag was causing test-cogl-multitexture to regenerate the
shader every frame.
(cherry picked from commit 17a98875d33c872800c04c26338427970b88b308)
Conflicts:
clutter/cogl/cogl/cogl-material-arbfp.c
clutter/cogl/cogl/cogl-pipeline-glsl.c
| -rw-r--r-- | clutter/cogl/cogl/cogl-material-arbfp.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/clutter/cogl/cogl/cogl-material-arbfp.c b/clutter/cogl/cogl/cogl-material-arbfp.c index 5c6c94871..190fe4d9a 100644 --- a/clutter/cogl/cogl/cogl-material-arbfp.c +++ b/clutter/cogl/cogl/cogl-material-arbfp.c @@ -1142,7 +1142,10 @@ _cogl_material_backend_arbfp_layer_pre_change_notify ( CoglMaterialBackendARBfpPrivate *priv; static const unsigned long not_fragment_op_changes = COGL_MATERIAL_LAYER_STATE_COMBINE_CONSTANT | - COGL_MATERIAL_LAYER_STATE_TEXTURE; + COGL_MATERIAL_LAYER_STATE_TEXTURE | + COGL_MATERIAL_LAYER_STATE_FILTERS | + COGL_MATERIAL_LAYER_STATE_WRAP_MODES | + COGL_MATERIAL_LAYER_STATE_USER_MATRIX; priv = get_arbfp_priv (owner); if (!priv) |