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

pipeline: Avoid costly checking of lighting properties

Browse Source 
During _cogl_pipeline_needs_blending_enabled we were always checking the
current lighting properties (ambient,diffuse,specular,emission) which
had a notable impact during micro-benchmarks that exercise journal
throughput of simple colored rectangles. This #if 0's the offending code
considering that Cogl doesn't actually support lighting currently and
when it actually does then we will be able to optimize this by avoiding
the checks when lighting is disabled.
This commit is contained in:
Robert Bragg 2010-11-01 20:33:20 +00:00
parent eaee5dd604
commit a6000533dc
1 changed files with 24 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
clutter/cogl/cogl/cogl-pipeline.c
View File

@ -864,9 +864,6 @@ _cogl_pipeline_needs_blending_enabled (CoglPipeline *pipeline,
if (changes & COGL_PIPELINE_STATE_LAYERS) if (changes & COGL_PIPELINE_STATE_LAYERS)
changes = COGL_PIPELINE_STATE_AFFECTS_BLENDING; changes = COGL_PIPELINE_STATE_AFFECTS_BLENDING;
/* XXX: we don't currently handle specific changes in an optimal way*/
changes = COGL_PIPELINE_STATE_AFFECTS_BLENDING;
if ((override_color && cogl_color_get_alpha_byte (override_color) != 0xff)) if ((override_color && cogl_color_get_alpha_byte (override_color) != 0xff))
return TRUE; return TRUE;
@ -878,13 +875,13 @@ _cogl_pipeline_needs_blending_enabled (CoglPipeline *pipeline,
return TRUE; return TRUE;
} }
/* We can't make any assumptions about the alpha channel if the user
* is using an unknown fragment shader.
*
* TODO: check that it isn't just a vertex shader!
*/
if (changes & COGL_PIPELINE_STATE_USER_SHADER) if (changes & COGL_PIPELINE_STATE_USER_SHADER)
{ {
/* We can't make any assumptions about the alpha channel if the user
* is using an unknown fragment shader.
*
* TODO: check that it isn't just a vertex shader!
*/
if (_cogl_pipeline_get_user_program (pipeline) != COGL_INVALID_HANDLE) if (_cogl_pipeline_get_user_program (pipeline) != COGL_INVALID_HANDLE)
return TRUE; return TRUE;
} }
@ -893,8 +890,13 @@ _cogl_pipeline_needs_blending_enabled (CoglPipeline *pipeline,
*/ */
if (changes & COGL_PIPELINE_STATE_LIGHTING) if (changes & COGL_PIPELINE_STATE_LIGHTING)
{ {
/* XXX: This stuff is showing up in sysprof reports which is
* silly because lighting isn't currently actually supported
* by Cogl except for these token properties. When we actually
* expose lighting support we can avoid these checks when
* lighting is disabled. */
#if 0
CoglColor tmp; CoglColor tmp;
cogl_pipeline_get_ambient (pipeline, &tmp); cogl_pipeline_get_ambient (pipeline, &tmp);
if (cogl_color_get_alpha_byte (&tmp) != 0xff) if (cogl_color_get_alpha_byte (&tmp) != 0xff)
return TRUE; return TRUE;
@ -907,6 +909,7 @@ _cogl_pipeline_needs_blending_enabled (CoglPipeline *pipeline,
cogl_pipeline_get_emission (pipeline, &tmp); cogl_pipeline_get_emission (pipeline, &tmp);
if (cogl_color_get_alpha_byte (&tmp) != 0xff) if (cogl_color_get_alpha_byte (&tmp) != 0xff)
return TRUE; return TRUE;
#endif
} }
if (changes & COGL_PIPELINE_STATE_LAYERS) if (changes & COGL_PIPELINE_STATE_LAYERS)
@ -921,15 +924,18 @@ _cogl_pipeline_needs_blending_enabled (CoglPipeline *pipeline,
if (has_alpha) if (has_alpha)
return TRUE; return TRUE;
} }
else
/* So far we have only checked the property that has been changed so {
* we now need to check all the other properties too. */ /* In this case we have so far only checked the property that
other_state = COGL_PIPELINE_STATE_AFFECTS_BLENDING & ~changes; * has been changed so we now need to check all the other
if (other_state && * properties too. */
_cogl_pipeline_needs_blending_enabled (pipeline, other_state = COGL_PIPELINE_STATE_AFFECTS_BLENDING & ~changes;
other_state, if (other_state &&
NULL)) _cogl_pipeline_needs_blending_enabled (pipeline,
return TRUE; other_state,
NULL))
return TRUE;
}
return FALSE; return FALSE;
} }