isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-25 17:40:40 -05:00
Code Issues Packages Projects Releases Wiki Activity
3b8d328652
mutter/cogl/cogl-pipeline-snippet.c

296 lines
9.2 KiB
C
Raw Normal View History

pipeline: Move the snippet source loop into a common function The two loops that generate the functions for the snippets in the fragend and vertend are very similar so to avoid code duplication this patch moves the logic to its own function in a new cogl-pipeline-snippet.c file. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2011-11-25 10:31:21 -05:00
/*
* Cogl
*
* An object oriented GL/GLES Abstraction/Utility Layer
*
Add fragment and vertex snippet hooks for global declarations This adds hook points to add global function and variable declarations to either the fragment or vertex shader. The declarations can then be used by subsequent snippets. Only the ‘declarations’ string of the snippet is used and the code is directly put in the global scope near the top of the shader. The reason this is necessary rather than just adding a normal snippet with the declarations is that for the other hooks Cogl assumes that the snippets are independent of each other. That means if a snippet has a replace string then it will assume that it doesn't even need to generate the code for earlier hooks which means the global declarations would be lost. Reviewed-by: Robert Bragg <robert@linux.intel.com> (cherry picked from commit ebb82d5b0bc30487b7101dc66b769160b40f92ca)
2013-02-26 12:52:20 -05:00
* Copyright (C) 2011, 2013 Intel Corporation.
pipeline: Move the snippet source loop into a common function The two loops that generate the functions for the snippets in the fragend and vertend are very similar so to avoid code duplication this patch moves the logic to its own function in a new cogl-pipeline-snippet.c file. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2011-11-25 10:31:21 -05:00
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library. If not, see
* <http://www.gnu.org/licenses/>.
*
*
*
* Authors:
* Neil Roberts <neil@linux.intel.com>
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <string.h>
Switch use of primitive glib types to c99 equivalents The coding style has for a long time said to avoid using redundant glib data types such as gint or gchar etc because we feel that they make the code look unnecessarily foreign to developers coming from outside of the Gnome developer community. Note: When we tried to find the historical rationale for the types we just found that they were apparently only added for consistent syntax highlighting which didn't seem that compelling. Up until now we have been continuing to use some of the platform specific type such as gint{8,16,32,64} and gsize but this patch switches us over to using the standard c99 equivalents instead so we can further ensure that our code looks familiar to the widest range of C developers who might potentially contribute to Cogl. So instead of using the gint{8,16,32,64} and guint{8,16,32,64} types this switches all Cogl code to instead use the int{8,16,32,64}_t and uint{8,16,32,64}_t c99 types instead. Instead of gsize we now use size_t For now we are not going to use the c99 _Bool type and instead we have introduced a new CoglBool type to use instead of gboolean. Reviewed-by: Neil Roberts <neil@linux.intel.com> (cherry picked from commit 5967dad2400d32ca6319cef6cb572e81bf2c15f0)
2012-04-16 16:56:40 -04:00
#include "cogl-types.h"
pipeline: Move the snippet source loop into a common function The two loops that generate the functions for the snippets in the fragend and vertend are very similar so to avoid code duplication this patch moves the logic to its own function in a new cogl-pipeline-snippet.c file. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2011-11-25 10:31:21 -05:00
#include "cogl-pipeline-snippet-private.h"
pipeline: Add a snippet hook for the texture lookup This adds a per-layer snippet hook for the texure lookup. Here the snippet can modify the texture coordinates used for the lookup or modify the texel resulting from the lookup. This is the first per-layer hook so this also adds the COGL_PIPELINE_LAYER_STATE_FRAGMENT_SNIPPETS state and all of the boilerplate needed to make that work. Most of the functions used by the pipeline state to manage the snippet list has been moved into cogl-pipeline-snippet.c so that it can be shared with the layer state. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2011-11-25 12:36:03 -05:00
#include "cogl-snippet-private.h"
#include "cogl-util.h"
pipeline: Move the snippet source loop into a common function The two loops that generate the functions for the snippets in the fragend and vertend are very similar so to avoid code duplication this patch moves the logic to its own function in a new cogl-pipeline-snippet.c file. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2011-11-25 10:31:21 -05:00
/* Helper functions that are used by both GLSL pipeline backends */
void
_cogl_pipeline_snippet_generate_code (const CoglPipelineSnippetData *data)
{
snippet: Don't generate code for snippets that are replaced The loop that generates code for a list of snippets now starts from the first snippet that has a replace string. Any snippets before that would be ignored so there's no point in generating code for them. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2011-11-25 16:57:05 -05:00
CoglPipelineSnippet *first_snippet, *snippet;
pipeline: Move the snippet source loop into a common function The two loops that generate the functions for the snippets in the fragend and vertend are very similar so to avoid code duplication this patch moves the logic to its own function in a new cogl-pipeline-snippet.c file. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2011-11-25 10:31:21 -05:00
int snippet_num = 0;
snippet: Fix detecting the last snippet 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>
2011-11-25 15:59:05 -05:00
int n_snippets = 0;
snippet: Don't generate code for snippets that are replaced The loop that generates code for a list of snippets now starts from the first snippet that has a replace string. Any snippets before that would be ignored so there's no point in generating code for them. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2011-11-25 16:57:05 -05:00
first_snippet = COGL_LIST_FIRST (data->snippets);
snippet: Fix detecting the last snippet 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>
2011-11-25 15:59:05 -05:00
/* 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)
snippet: Don't generate code for snippets that are replaced The loop that generates code for a list of snippets now starts from the first snippet that has a replace string. Any snippets before that would be ignored so there's no point in generating code for them. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2011-11-25 16:57:05 -05:00
{
/* Don't bother processing any previous snippets if we reach
one that has a replacement */
if (snippet->snippet->replace)
{
n_snippets = 1;
first_snippet = snippet;
}
else
n_snippets++;
}
pipeline: Move the snippet source loop into a common function The two loops that generate the functions for the snippets in the fragend and vertend are very similar so to avoid code duplication this patch moves the logic to its own function in a new cogl-pipeline-snippet.c file. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2011-11-25 10:31:21 -05:00
snippet: Don't generate code for snippets that are replaced The loop that generates code for a list of snippets now starts from the first snippet that has a replace string. Any snippets before that would be ignored so there's no point in generating code for them. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2011-11-25 16:57:05 -05:00
/* If there weren't any snippets then generate a stub function with
the final name */
if (n_snippets == 0)
{
if (data->return_type)
g_string_append_printf (data->source_buf,
"\n"
"%s\n"
"%s (%s)\n"
"{\n"
" return %s (%s);\n"
"}\n",
data->return_type,
data->final_name,
data->argument_declarations ?
data->argument_declarations : "",
data->chain_function,
data->arguments ? data->arguments : "");
else
g_string_append_printf (data->source_buf,
"\n"
"void\n"
"%s (%s)\n"
"{\n"
" %s (%s);\n"
"}\n",
data->final_name,
data->argument_declarations ?
data->argument_declarations : "",
data->chain_function,
data->arguments ? data->arguments : "");
return;
}
for (snippet = first_snippet, snippet_num = 0;
snippet_num < n_snippets;
Fix multiple snippet interleaving bug Interleaving multiple snippets with different hooks (COGL_SNIPPET_HOOK_VERTEX and COGL_SNIPPET_HOOK_VERTEX_TRANSFORM, for instance) used to cause a bug during shader code generation. Reviewed-by: Neil Roberts <neil@linux.intel.com> (cherry picked from commit 38ca76695d54bbbfe3b940a6d0b2ae879e6fd66b)
2013-03-20 10:25:19 -04:00
snippet = COGL_LIST_NEXT (snippet, list_node))
snippet: Move the hook to be a property of the snippet Instead of specifying the hook point when adding to the pipeline using a separate function for each hook, the hook is now a property of the snippet. The hook is set on construction and is then read-only. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2011-11-25 15:54:14 -05:00
if (snippet->snippet->hook == data->hook)
pipeline: Move the snippet source loop into a common function The two loops that generate the functions for the snippets in the fragend and vertend are very similar so to avoid code duplication this patch moves the logic to its own function in a new cogl-pipeline-snippet.c file. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2011-11-25 10:31:21 -05:00
{
const char *source;
if ((source = cogl_snippet_get_declarations (snippet->snippet)))
g_string_append (data->source_buf, source);
g_string_append_printf (data->source_buf,
"\n"
"%s\n",
data->return_type ?
data->return_type :
"void");
snippet: Fix detecting the last snippet 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>
2011-11-25 15:59:05 -05:00
if (snippet_num + 1 < n_snippets)
pipeline: Move the snippet source loop into a common function The two loops that generate the functions for the snippets in the fragend and vertend are very similar so to avoid code duplication this patch moves the logic to its own function in a new cogl-pipeline-snippet.c file. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2011-11-25 10:31:21 -05:00
g_string_append_printf (data->source_buf,
"%s_%i",
data->function_prefix,
snippet_num);
else
g_string_append (data->source_buf, data->final_name);
g_string_append (data->source_buf, " (");
if (data->argument_declarations)
g_string_append (data->source_buf, data->argument_declarations);
g_string_append (data->source_buf,
")\n"
"{\n");
snippet: Add a hook for the layer texture coordinate transformation This adds a hook called COGL_SNIPPET_HOOK_TEXTURE_COORD_TRANSFORM. This can be used to alter the application of the layer user matrix to a texture coordinate or it can bypass it altogether. This is the first per-layer hook that affects the vertex shader state so the patch includes the boilerplate needed to get that to work. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2011-11-28 14:58:15 -05:00
if (data->return_type && !data->return_variable_is_argument)
pipeline: Move the snippet source loop into a common function The two loops that generate the functions for the snippets in the fragend and vertend are very similar so to avoid code duplication this patch moves the logic to its own function in a new cogl-pipeline-snippet.c file. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2011-11-25 10:31:21 -05:00
g_string_append_printf (data->source_buf,
" %s %s;\n"
"\n",
data->return_type,
data->return_variable);
if ((source = cogl_snippet_get_pre (snippet->snippet)))
g_string_append (data->source_buf, source);
/* Chain on to the next function, or bypass it if there is
a replace string */
if ((source = cogl_snippet_get_replace (snippet->snippet)))
g_string_append (data->source_buf, source);
else
{
g_string_append (data->source_buf, " ");
if (data->return_type)
g_string_append_printf (data->source_buf,
"%s = ",
data->return_variable);
if (snippet_num > 0)
g_string_append_printf (data->source_buf,
"%s_%i",
data->function_prefix,
snippet_num - 1);
else
g_string_append (data->source_buf, data->chain_function);
g_string_append (data->source_buf, " (");
if (data->arguments)
g_string_append (data->source_buf, data->arguments);
g_string_append (data->source_buf, ");\n");
}
if ((source = cogl_snippet_get_post (snippet->snippet)))
g_string_append (data->source_buf, source);
if (data->return_type)
g_string_append_printf (data->source_buf,
" return %s;\n",
data->return_variable);
g_string_append (data->source_buf, "}\n");
Fix multiple snippet interleaving bug Interleaving multiple snippets with different hooks (COGL_SNIPPET_HOOK_VERTEX and COGL_SNIPPET_HOOK_VERTEX_TRANSFORM, for instance) used to cause a bug during shader code generation. Reviewed-by: Neil Roberts <neil@linux.intel.com> (cherry picked from commit 38ca76695d54bbbfe3b940a6d0b2ae879e6fd66b)
2013-03-20 10:25:19 -04:00
snippet_num++;
pipeline: Move the snippet source loop into a common function The two loops that generate the functions for the snippets in the fragend and vertend are very similar so to avoid code duplication this patch moves the logic to its own function in a new cogl-pipeline-snippet.c file. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2011-11-25 10:31:21 -05:00
}
}
pipeline: Add a snippet hook for the texture lookup This adds a per-layer snippet hook for the texure lookup. Here the snippet can modify the texture coordinates used for the lookup or modify the texel resulting from the lookup. This is the first per-layer hook so this also adds the COGL_PIPELINE_LAYER_STATE_FRAGMENT_SNIPPETS state and all of the boilerplate needed to make that work. Most of the functions used by the pipeline state to manage the snippet list has been moved into cogl-pipeline-snippet.c so that it can be shared with the layer state. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2011-11-25 12:36:03 -05:00
Add fragment and vertex snippet hooks for global declarations This adds hook points to add global function and variable declarations to either the fragment or vertex shader. The declarations can then be used by subsequent snippets. Only the ‘declarations’ string of the snippet is used and the code is directly put in the global scope near the top of the shader. The reason this is necessary rather than just adding a normal snippet with the declarations is that for the other hooks Cogl assumes that the snippets are independent of each other. That means if a snippet has a replace string then it will assume that it doesn't even need to generate the code for earlier hooks which means the global declarations would be lost. Reviewed-by: Robert Bragg <robert@linux.intel.com> (cherry picked from commit ebb82d5b0bc30487b7101dc66b769160b40f92ca)
2013-02-26 12:52:20 -05:00
void
_cogl_pipeline_snippet_generate_declarations (GString *declarations_buf,
CoglSnippetHook hook,
CoglPipelineSnippetList *snippets)
{
CoglPipelineSnippet *snippet;
COGL_LIST_FOREACH (snippet, snippets, list_node)
if (snippet->snippet->hook == hook)
{
const char *source;
if ((source = cogl_snippet_get_declarations (snippet->snippet)))
g_string_append (declarations_buf, source);
}
}
pipeline: Add a snippet hook for the texture lookup This adds a per-layer snippet hook for the texure lookup. Here the snippet can modify the texture coordinates used for the lookup or modify the texel resulting from the lookup. This is the first per-layer hook so this also adds the COGL_PIPELINE_LAYER_STATE_FRAGMENT_SNIPPETS state and all of the boilerplate needed to make that work. Most of the functions used by the pipeline state to manage the snippet list has been moved into cogl-pipeline-snippet.c so that it can be shared with the layer state. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2011-11-25 12:36:03 -05:00
static void
_cogl_pipeline_snippet_free (CoglPipelineSnippet *pipeline_snippet)
{
cogl_object_unref (pipeline_snippet->snippet);
g_slice_free (CoglPipelineSnippet, pipeline_snippet);
}
void
_cogl_pipeline_snippet_list_free (CoglPipelineSnippetList *list)
{
CoglPipelineSnippet *pipeline_snippet, *tmp;
COGL_LIST_FOREACH_SAFE (pipeline_snippet, list, list_node, tmp)
_cogl_pipeline_snippet_free (pipeline_snippet);
}
void
_cogl_pipeline_snippet_list_add (CoglPipelineSnippetList *list,
CoglSnippet *snippet)
{
CoglPipelineSnippet *pipeline_snippet = g_slice_new (CoglPipelineSnippet);
pipeline_snippet->snippet = cogl_object_ref (snippet);
_cogl_snippet_make_immutable (pipeline_snippet->snippet);
if (COGL_LIST_EMPTY (list))
COGL_LIST_INSERT_HEAD (list, pipeline_snippet, list_node);
else
{
CoglPipelineSnippet *tail;
for (tail = COGL_LIST_FIRST (list);
COGL_LIST_NEXT (tail, list_node);
tail = COGL_LIST_NEXT (tail, list_node));
COGL_LIST_INSERT_AFTER (tail, pipeline_snippet, list_node);
}
}
void
_cogl_pipeline_snippet_list_copy (CoglPipelineSnippetList *dst,
const CoglPipelineSnippetList *src)
{
CoglPipelineSnippet *tail = NULL;
const CoglPipelineSnippet *l;
COGL_LIST_INIT (dst);
COGL_LIST_FOREACH (l, src, list_node)
{
CoglPipelineSnippet *copy = g_slice_dup (CoglPipelineSnippet, l);
cogl_object_ref (copy->snippet);
if (tail)
COGL_LIST_INSERT_AFTER (tail, copy, list_node);
else
COGL_LIST_INSERT_HEAD (dst, copy, list_node);
tail = copy;
}
}
void
_cogl_pipeline_snippet_list_hash (CoglPipelineSnippetList *list,
unsigned int *hash)
{
CoglPipelineSnippet *l;
COGL_LIST_FOREACH (l, list, list_node)
{
*hash = _cogl_util_one_at_a_time_hash (*hash,
&l->snippet,
sizeof (CoglSnippet *));
}
}
Switch use of primitive glib types to c99 equivalents The coding style has for a long time said to avoid using redundant glib data types such as gint or gchar etc because we feel that they make the code look unnecessarily foreign to developers coming from outside of the Gnome developer community. Note: When we tried to find the historical rationale for the types we just found that they were apparently only added for consistent syntax highlighting which didn't seem that compelling. Up until now we have been continuing to use some of the platform specific type such as gint{8,16,32,64} and gsize but this patch switches us over to using the standard c99 equivalents instead so we can further ensure that our code looks familiar to the widest range of C developers who might potentially contribute to Cogl. So instead of using the gint{8,16,32,64} and guint{8,16,32,64} types this switches all Cogl code to instead use the int{8,16,32,64}_t and uint{8,16,32,64}_t c99 types instead. Instead of gsize we now use size_t For now we are not going to use the c99 _Bool type and instead we have introduced a new CoglBool type to use instead of gboolean. Reviewed-by: Neil Roberts <neil@linux.intel.com> (cherry picked from commit 5967dad2400d32ca6319cef6cb572e81bf2c15f0)
2012-04-16 16:56:40 -04:00
CoglBool
pipeline: Add a snippet hook for the texture lookup This adds a per-layer snippet hook for the texure lookup. Here the snippet can modify the texture coordinates used for the lookup or modify the texel resulting from the lookup. This is the first per-layer hook so this also adds the COGL_PIPELINE_LAYER_STATE_FRAGMENT_SNIPPETS state and all of the boilerplate needed to make that work. Most of the functions used by the pipeline state to manage the snippet list has been moved into cogl-pipeline-snippet.c so that it can be shared with the layer state. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2011-11-25 12:36:03 -05:00
_cogl_pipeline_snippet_list_equal (CoglPipelineSnippetList *list0,
CoglPipelineSnippetList *list1)
{
CoglPipelineSnippet *l0, *l1;
for (l0 = COGL_LIST_FIRST (list0), l1 = COGL_LIST_FIRST (list1);
l0 && l1;
l0 = COGL_LIST_NEXT (l0, list_node), l1 = COGL_LIST_NEXT (l1, list_node))
snippet: Move the hook to be a property of the snippet Instead of specifying the hook point when adding to the pipeline using a separate function for each hook, the hook is now a property of the snippet. The hook is set on construction and is then read-only. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2011-11-25 15:54:14 -05:00
if (l0->snippet != l1->snippet)
pipeline: Add a snippet hook for the texture lookup This adds a per-layer snippet hook for the texure lookup. Here the snippet can modify the texture coordinates used for the lookup or modify the texel resulting from the lookup. This is the first per-layer hook so this also adds the COGL_PIPELINE_LAYER_STATE_FRAGMENT_SNIPPETS state and all of the boilerplate needed to make that work. Most of the functions used by the pipeline state to manage the snippet list has been moved into cogl-pipeline-snippet.c so that it can be shared with the layer state. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2011-11-25 12:36:03 -05:00
return FALSE;
return l0 == NULL && l1 == NULL;
}
Reference in New Issue Copy Permalink