isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-26 01:50:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

cogl-path: Don't apply legacy state twice when stroking

Browse Source 
Since 12b3d21aaa cogl is using the vertex attribute API to stroke a
path. However it was still manually appllying the legacy state to the
pipeline. cogl_vdraw_attributes also applies the legacy state so it
ends up getting applied twice. This patch just removes it from
_cogl_path_stroke_nodes.

Reviewed-by: Robert Bragg <robert@linux.intel.com>
This commit is contained in:
Neil Roberts 2011-09-14 12:32:02 +01:00 committed by Robert Bragg
parent f7b24d88f4
commit acc7d25188
1 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
cogl/cogl2-path.c
View File

@ -210,21 +210,11 @@ _cogl_path_stroke_nodes (CoglPath *path)
_COGL_GET_CONTEXT (ctx, NO_RETVAL); _COGL_GET_CONTEXT (ctx, NO_RETVAL);
if (G_UNLIKELY (ctx->legacy_state_set)) source = cogl_get_source ();
{
CoglPipeline *users_source = cogl_get_source ();
copy = cogl_pipeline_copy (users_source);
_cogl_pipeline_apply_legacy_state (copy);
source = copy;
}
else
source = cogl_get_source ();
if (cogl_pipeline_get_n_layers (source) != 0) if (cogl_pipeline_get_n_layers (source) != 0)
{ {
/* If we haven't already created a derivative pipeline... */ copy = cogl_pipeline_copy (source);
if (!copy)
copy = cogl_pipeline_copy (source);
_cogl_pipeline_prune_to_n_layers (copy, 0); _cogl_pipeline_prune_to_n_layers (copy, 0);
source = copy; source = copy;
} }