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

primitives: make validate_first_layer_cb update override pipeline

Browse Source 
This fixes validate_first_layer_cb so that it update the override
pipeline not the user's original pipeline. It also makes the check
for when to override the wrap mode more robust by considering that
we might add more wrap modes in the future.

Reviewed-by: Neil Roberts <neil@linux.intel.com>
This commit is contained in:
Robert Bragg 2011-10-12 11:53:31 +01:00
parent 583dc893be
commit eef5013751
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
cogl/cogl-primitives.c
View File

@ -143,23 +143,27 @@ validate_first_layer_cb (CoglPipeline *pipeline,
/* We can't use hardware repeat so we need to set clamp to edge
* otherwise it might pull in edge pixels from the other side. By
* default WRAP_MODE_AUTOMATIC becomes CLAMP_TO_EDGE so we only need
* to override if the wrap mode is repeat.
* to override if the wrap mode isn't already automatic or
* clamp_to_edge.
*/
if (cogl_pipeline_get_layer_wrap_mode_s (pipeline, layer_index) ==
COGL_PIPELINE_WRAP_MODE_REPEAT)
wrap_s = cogl_pipeline_get_layer_wrap_mode_s (pipeline, layer_index);
if (wrap_s != COGL_PIPELINE_WRAP_MODE_CLAMP_TO_EDGE &&
wrap_s != COGL_PIPELINE_WRAP_MODE_AUTOMATIC)
{
if (!state->override_pipeline)
state->override_pipeline = cogl_pipeline_copy (pipeline);
cogl_pipeline_set_layer_wrap_mode_s (pipeline, layer_index,
clamp_to_edge);
cogl_pipeline_set_layer_wrap_mode_s (state->override_pipeline,
layer_index, clamp_to_edge);
}
if (cogl_pipeline_get_layer_wrap_mode_t (pipeline, layer_index) ==
COGL_PIPELINE_WRAP_MODE_REPEAT)
wrap_t = cogl_pipeline_get_layer_wrap_mode_t (pipeline, layer_index);
if (wrap_t != COGL_PIPELINE_WRAP_MODE_CLAMP_TO_EDGE &&
wrap_t != COGL_PIPELINE_WRAP_MODE_AUTOMATIC)
{
if (!state->override_pipeline)
state->override_pipeline = cogl_pipeline_copy (pipeline);
cogl_pipeline_set_layer_wrap_mode_t (pipeline, layer_index,
clamp_to_edge);
cogl_pipeline_set_layer_wrap_mode_t (state->override_pipeline,
layer_index, clamp_to_edge);
}
return FALSE;