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

snippet: Fix detecting the last snippet

Browse Source 
The function for generating the GLSL for a list of snippets was trying
to detect the last snippet so that it could use a different function
name. However this wouldn't work if the last snippet has a different
hook. To fix this it now just counts the snippets that have the same
hook beforehand and detects the last one using the count.

Reviewed-by: Robert Bragg <robert@linux.intel.com>
This commit is contained in:
Neil Roberts 2011-11-25 20:59:05 +00:00 committed by Robert Bragg
parent 09c2e4abe7
commit cdc4bd6361
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cogl/cogl-pipeline-snippet.c
View File

@ -42,6 +42,13 @@ _cogl_pipeline_snippet_generate_code (const CoglPipelineSnippetData *data)
{ {
CoglPipelineSnippet *snippet; CoglPipelineSnippet *snippet;
int snippet_num = 0; int snippet_num = 0;
int n_snippets = 0;
/* First count the number of snippets so we can easily tell when
we're at the last one */
COGL_LIST_FOREACH (snippet, data->snippets, list_node)
if (snippet->snippet->hook == data->hook)
n_snippets++;
COGL_LIST_FOREACH (snippet, data->snippets, list_node) COGL_LIST_FOREACH (snippet, data->snippets, list_node)
if (snippet->snippet->hook == data->hook) if (snippet->snippet->hook == data->hook)
@ -58,7 +65,7 @@ _cogl_pipeline_snippet_generate_code (const CoglPipelineSnippetData *data)
data->return_type : data->return_type :
"void"); "void");
if (COGL_LIST_NEXT (snippet, list_node)) if (snippet_num + 1 < n_snippets)
g_string_append_printf (data->source_buf, g_string_append_printf (data->source_buf,
"%s_%i", "%s_%i",
data->function_prefix, data->function_prefix,