brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

material-arbfp: don't redo codegen for texture changes

Browse Source 
This makes it so we don't consider LAYER_STATE_TEXTURE changes to affect
the arbfp code. This should avoid a lot of unneeded passes of
code generation for applications modifying the texture for a layer.
This commit is contained in:
Robert Bragg 2010-09-14 00:27:57 +01:00
parent 0717eb9f6b
commit 17538cf5e6
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cogl/cogl-material-arbfp.c
View File

@ -135,8 +135,7 @@ layers_arbfp_would_differ (CoglMaterialLayer **material0_layers,
unsigned long arbfp_codegen_modifiers = unsigned long arbfp_codegen_modifiers =
COGL_MATERIAL_LAYER_STATE_COMBINE | COGL_MATERIAL_LAYER_STATE_COMBINE |
COGL_MATERIAL_LAYER_STATE_COMBINE_CONSTANT | COGL_MATERIAL_LAYER_STATE_COMBINE_CONSTANT |
COGL_MATERIAL_LAYER_STATE_UNIT | COGL_MATERIAL_LAYER_STATE_UNIT;
COGL_MATERIAL_LAYER_STATE_TEXTURE;
for (i = 0; i < n_layers; i++) for (i = 0; i < n_layers; i++)
{ {
@ -1201,11 +1200,18 @@ _cogl_material_backend_arbfp_layer_pre_change_notify (
CoglMaterialLayerState change) CoglMaterialLayerState change)
{ {
CoglMaterialBackendARBfpPrivate *priv = get_arbfp_authority_priv (owner); CoglMaterialBackendARBfpPrivate *priv = get_arbfp_authority_priv (owner);
static const unsigned long not_fragment_op_changes =
COGL_MATERIAL_LAYER_STATE_TEXTURE;
priv = get_arbfp_authority_priv (owner);
if (!priv) if (!priv)
return; return;
if (!(change & not_fragment_op_changes))
{
dirty_fragment_state (owner, priv); dirty_fragment_state (owner, priv);
return;
}
/* TODO: we could be saving snippets of texture combine code along /* TODO: we could be saving snippets of texture combine code along
* with each layer and then when a layer changes we would just free * with each layer and then when a layer changes we would just free