brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
671275ba36
mutter/tests/conform/test-snippets.c

708 lines
23 KiB
C
Raw Normal View History

Add a conformance test for CoglSnippets This adds a conformance test testing various operations on CoglSnippets. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2011-11-17 11:52:50 -05:00
#include <cogl/cogl.h>
#include <string.h>
#include "test-utils.h"
typedef struct _TestState
{
Adds cogl_framebuffer_draw_[*_]rectangle functions This adds experimental 2.0 api replacements for the cogl_rectangle[_*] functions that don't depend on having a current pipeline set on the context via cogl_{set,push}_source() or having a current framebuffer set on the context via cogl_push_framebuffer(). The aim for 2.0 is to switch away from having a statefull context that affects drawing to having framebuffer drawing apis that are explicitly passed a framebuffer and pipeline. To test this change several of the conformance tests were updated to use this api instead of cogl_rectangle and cogl_rectangle_with_texture_coords. Since it's quite laborious going through all of the conformance tests the opportunity was taken to make other clean ups in the conformance tests to replace other uses of 1.x api with experimental 2.0 api so long as that didn't affect what was being tested.
2012-03-16 15:54:13 -04:00
int padding;
Add a conformance test for CoglSnippets This adds a conformance test testing various operations on CoglSnippets. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2011-11-17 11:52:50 -05:00
} TestState;
test-snippets: Split up the tests into multiple functions There were lots of tests bundled into a single long function which was becoming a bit unwieldy. It was also quite difficult to match up the test's drawing with its color test. This patch just moves each little sub test into its own function. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2012-02-10 11:33:10 -05:00
typedef void (* SnippetTestFunc) (TestState *state);
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 CoglPipeline *
Adds a context arg to cogl_pipeline_new() As we move towards Cogl 2.0 we are aiming to remove the need for a default global CoglContext and so everything should be explicitly related to a context somehow. CoglPipelines are top level objects and so this patch adds a context argument to cogl_pipeline_new(). Reviewed-by: Neil Roberts <neil@linux.intel.com>
2012-02-18 11:03:10 -05:00
create_texture_pipeline (TestState *state)
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
{
CoglPipeline *pipeline;
Adds cogl_framebuffer_draw_[*_]rectangle functions This adds experimental 2.0 api replacements for the cogl_rectangle[_*] functions that don't depend on having a current pipeline set on the context via cogl_{set,push}_source() or having a current framebuffer set on the context via cogl_push_framebuffer(). The aim for 2.0 is to switch away from having a statefull context that affects drawing to having framebuffer drawing apis that are explicitly passed a framebuffer and pipeline. To test this change several of the conformance tests were updated to use this api instead of cogl_rectangle and cogl_rectangle_with_texture_coords. Since it's quite laborious going through all of the conformance tests the opportunity was taken to make other clean ups in the conformance tests to replace other uses of 1.x api with experimental 2.0 api so long as that didn't affect what was being tested.
2012-03-16 15:54:13 -04:00
CoglTexture *tex;
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
static const uint8_t tex_data[] =
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
{
0xff, 0x00, 0x00, 0xff, /* red */ 0x00, 0xff, 0x00, 0xff, /* green */
0x00, 0x00, 0xff, 0xff, /* blue */ 0xff, 0xff, 0x00, 0xff, /* yellow */
};
tex = cogl_texture_new_from_data (2, 2, /* width/height */
COGL_TEXTURE_NO_ATLAS,
COGL_PIXEL_FORMAT_RGBA_8888_PRE,
COGL_PIXEL_FORMAT_ANY,
8, /* rowstride */
tex_data);
tests: update inline with master This renames the global ctx and fb variables to test_ctx and test_fb respectively in line with the names use on the master branch. This is to make it easier to cherry pick patches from master.
2013-01-18 12:57:06 -05:00
pipeline = cogl_pipeline_new (test_ctx);
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_set_layer_texture (pipeline, 0, tex);
cogl_pipeline_set_layer_filters (pipeline, 0,
COGL_PIPELINE_FILTER_NEAREST,
COGL_PIPELINE_FILTER_NEAREST);
Adds cogl_framebuffer_draw_[*_]rectangle functions This adds experimental 2.0 api replacements for the cogl_rectangle[_*] functions that don't depend on having a current pipeline set on the context via cogl_{set,push}_source() or having a current framebuffer set on the context via cogl_push_framebuffer(). The aim for 2.0 is to switch away from having a statefull context that affects drawing to having framebuffer drawing apis that are explicitly passed a framebuffer and pipeline. To test this change several of the conformance tests were updated to use this api instead of cogl_rectangle and cogl_rectangle_with_texture_coords. Since it's quite laborious going through all of the conformance tests the opportunity was taken to make other clean ups in the conformance tests to replace other uses of 1.x api with experimental 2.0 api so long as that didn't affect what was being tested.
2012-03-16 15:54:13 -04:00
cogl_object_unref (tex);
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 pipeline;
}
Add a conformance test for CoglSnippets This adds a conformance test testing various operations on CoglSnippets. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2011-11-17 11:52:50 -05:00
static void
test-snippets: Split up the tests into multiple functions There were lots of tests bundled into a single long function which was becoming a bit unwieldy. It was also quite difficult to match up the test's drawing with its color test. This patch just moves each little sub test into its own function. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2012-02-10 11:33:10 -05:00
simple_fragment_snippet (TestState *state)
Add a conformance test for CoglSnippets This adds a conformance test testing various operations on CoglSnippets. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2011-11-17 11:52:50 -05:00
{
CoglPipeline *pipeline;
CoglSnippet *snippet;
/* Simple fragment snippet */
tests: update inline with master This renames the global ctx and fb variables to test_ctx and test_fb respectively in line with the names use on the master branch. This is to make it easier to cherry pick patches from master.
2013-01-18 12:57:06 -05:00
pipeline = cogl_pipeline_new (test_ctx);
Add a conformance test for CoglSnippets This adds a conformance test testing various operations on CoglSnippets. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2011-11-17 11:52:50 -05:00
cogl_pipeline_set_color4ub (pipeline, 255, 0, 0, 255);
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
snippet = cogl_snippet_new (COGL_SNIPPET_HOOK_FRAGMENT,
NULL, /* declarations */
"cogl_color_out.g += 1.0;");
cogl_pipeline_add_snippet (pipeline, snippet);
Add a conformance test for CoglSnippets This adds a conformance test testing various operations on CoglSnippets. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2011-11-17 11:52:50 -05:00
cogl_object_unref (snippet);
tests: update inline with master This renames the global ctx and fb variables to test_ctx and test_fb respectively in line with the names use on the master branch. This is to make it easier to cherry pick patches from master.
2013-01-18 12:57:06 -05:00
cogl_framebuffer_draw_rectangle (test_fb, pipeline, 0, 0, 10, 10);
Add a conformance test for CoglSnippets This adds a conformance test testing various operations on CoglSnippets. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2011-11-17 11:52:50 -05:00
cogl_object_unref (pipeline);
tests: update inline with master This renames the global ctx and fb variables to test_ctx and test_fb respectively in line with the names use on the master branch. This is to make it easier to cherry pick patches from master.
2013-01-18 12:57:06 -05:00
test_utils_check_pixel (test_fb, 5, 5, 0xffff00ff);
test-snippets: Split up the tests into multiple functions There were lots of tests bundled into a single long function which was becoming a bit unwieldy. It was also quite difficult to match up the test's drawing with its color test. This patch just moves each little sub test into its own function. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2012-02-10 11:33:10 -05:00
}
static void
simple_vertex_snippet (TestState *state)
{
CoglPipeline *pipeline;
CoglSnippet *snippet;
Add a conformance test for CoglSnippets This adds a conformance test testing various operations on CoglSnippets. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2011-11-17 11:52:50 -05:00
/* Simple vertex snippet */
tests: update inline with master This renames the global ctx and fb variables to test_ctx and test_fb respectively in line with the names use on the master branch. This is to make it easier to cherry pick patches from master.
2013-01-18 12:57:06 -05:00
pipeline = cogl_pipeline_new (test_ctx);
Add a conformance test for CoglSnippets This adds a conformance test testing various operations on CoglSnippets. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2011-11-17 11:52:50 -05:00
cogl_pipeline_set_color4ub (pipeline, 255, 0, 0, 255);
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
snippet = cogl_snippet_new (COGL_SNIPPET_HOOK_VERTEX,
NULL,
"cogl_color_out.b += 1.0;");
cogl_pipeline_add_snippet (pipeline, snippet);
Add a conformance test for CoglSnippets This adds a conformance test testing various operations on CoglSnippets. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2011-11-17 11:52:50 -05:00
cogl_object_unref (snippet);
tests: update inline with master This renames the global ctx and fb variables to test_ctx and test_fb respectively in line with the names use on the master branch. This is to make it easier to cherry pick patches from master.
2013-01-18 12:57:06 -05:00
cogl_framebuffer_draw_rectangle (test_fb, pipeline, 10, 0, 20, 10);
Add a conformance test for CoglSnippets This adds a conformance test testing various operations on CoglSnippets. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2011-11-17 11:52:50 -05:00
cogl_object_unref (pipeline);
tests: update inline with master This renames the global ctx and fb variables to test_ctx and test_fb respectively in line with the names use on the master branch. This is to make it easier to cherry pick patches from master.
2013-01-18 12:57:06 -05:00
test_utils_check_pixel (test_fb, 15, 5, 0xff00ffff);
test-snippets: Split up the tests into multiple functions There were lots of tests bundled into a single long function which was becoming a bit unwieldy. It was also quite difficult to match up the test's drawing with its color test. This patch just moves each little sub test into its own function. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2012-02-10 11:33:10 -05:00
}
static void
shared_uniform (TestState *state)
{
CoglPipeline *pipeline;
CoglSnippet *snippet;
int location;
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
/* Snippets sharing a uniform across the vertex and fragment
hooks */
tests: update inline with master This renames the global ctx and fb variables to test_ctx and test_fb respectively in line with the names use on the master branch. This is to make it easier to cherry pick patches from master.
2013-01-18 12:57:06 -05:00
pipeline = cogl_pipeline_new (test_ctx);
Add a conformance test for CoglSnippets This adds a conformance test testing various operations on CoglSnippets. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2011-11-17 11:52:50 -05:00
location = cogl_pipeline_get_uniform_location (pipeline, "a_value");
cogl_pipeline_set_uniform_1f (pipeline, location, 0.25f);
cogl_pipeline_set_color4ub (pipeline, 255, 0, 0, 255);
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
snippet = cogl_snippet_new (COGL_SNIPPET_HOOK_VERTEX,
"uniform float a_value;",
Add a conformance test for CoglSnippets This adds a conformance test testing various operations on CoglSnippets. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2011-11-17 11:52:50 -05:00
"cogl_color_out.b += a_value;");
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
cogl_pipeline_add_snippet (pipeline, snippet);
cogl_object_unref (snippet);
snippet = cogl_snippet_new (COGL_SNIPPET_HOOK_FRAGMENT,
"uniform float a_value;",
"cogl_color_out.b += a_value;");
cogl_pipeline_add_snippet (pipeline, snippet);
Add a conformance test for CoglSnippets This adds a conformance test testing various operations on CoglSnippets. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2011-11-17 11:52:50 -05:00
cogl_object_unref (snippet);
tests: update inline with master This renames the global ctx and fb variables to test_ctx and test_fb respectively in line with the names use on the master branch. This is to make it easier to cherry pick patches from master.
2013-01-18 12:57:06 -05:00
cogl_framebuffer_draw_rectangle (test_fb,
Adds cogl_framebuffer_draw_[*_]rectangle functions This adds experimental 2.0 api replacements for the cogl_rectangle[_*] functions that don't depend on having a current pipeline set on the context via cogl_{set,push}_source() or having a current framebuffer set on the context via cogl_push_framebuffer(). The aim for 2.0 is to switch away from having a statefull context that affects drawing to having framebuffer drawing apis that are explicitly passed a framebuffer and pipeline. To test this change several of the conformance tests were updated to use this api instead of cogl_rectangle and cogl_rectangle_with_texture_coords. Since it's quite laborious going through all of the conformance tests the opportunity was taken to make other clean ups in the conformance tests to replace other uses of 1.x api with experimental 2.0 api so long as that didn't affect what was being tested.
2012-03-16 15:54:13 -04:00
pipeline,
20, 0, 30, 10);
Add a conformance test for CoglSnippets This adds a conformance test testing various operations on CoglSnippets. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2011-11-17 11:52:50 -05:00
cogl_object_unref (pipeline);
tests: update inline with master This renames the global ctx and fb variables to test_ctx and test_fb respectively in line with the names use on the master branch. This is to make it easier to cherry pick patches from master.
2013-01-18 12:57:06 -05:00
test_utils_check_pixel (test_fb, 25, 5, 0xff0080ff);
test-snippets: Split up the tests into multiple functions There were lots of tests bundled into a single long function which was becoming a bit unwieldy. It was also quite difficult to match up the test's drawing with its color test. This patch just moves each little sub test into its own function. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2012-02-10 11:33:10 -05:00
}
static void
lots_snippets (TestState *state)
{
CoglPipeline *pipeline;
CoglSnippet *snippet;
int location;
int i;
Add a conformance test for CoglSnippets This adds a conformance test testing various operations on CoglSnippets. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2011-11-17 11:52:50 -05:00
/* Lots of snippets on one pipeline */
tests: update inline with master This renames the global ctx and fb variables to test_ctx and test_fb respectively in line with the names use on the master branch. This is to make it easier to cherry pick patches from master.
2013-01-18 12:57:06 -05:00
pipeline = cogl_pipeline_new (test_ctx);
Add a conformance test for CoglSnippets This adds a conformance test testing various operations on CoglSnippets. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2011-11-17 11:52:50 -05:00
cogl_pipeline_set_color4ub (pipeline, 0, 0, 0, 255);
for (i = 0; i < 3; i++)
{
char letter = 'x' + i;
char *uniform_name = g_strdup_printf ("%c_value", letter);
char *declarations = g_strdup_printf ("uniform float %s;\n",
uniform_name);
char *code = g_strdup_printf ("cogl_color_out.%c = %s;\n",
letter,
uniform_name);
location = cogl_pipeline_get_uniform_location (pipeline, uniform_name);
cogl_pipeline_set_uniform_1f (pipeline, location, (i + 1) * 0.1f);
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
snippet = cogl_snippet_new (COGL_SNIPPET_HOOK_FRAGMENT,
declarations,
code);
cogl_pipeline_add_snippet (pipeline, snippet);
Add a conformance test for CoglSnippets This adds a conformance test testing various operations on CoglSnippets. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2011-11-17 11:52:50 -05:00
cogl_object_unref (snippet);
g_free (code);
g_free (uniform_name);
g_free (declarations);
}
tests: update inline with master This renames the global ctx and fb variables to test_ctx and test_fb respectively in line with the names use on the master branch. This is to make it easier to cherry pick patches from master.
2013-01-18 12:57:06 -05:00
cogl_framebuffer_draw_rectangle (test_fb, pipeline, 30, 0, 40, 10);
Add a conformance test for CoglSnippets This adds a conformance test testing various operations on CoglSnippets. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2011-11-17 11:52:50 -05:00
cogl_object_unref (pipeline);
tests: update inline with master This renames the global ctx and fb variables to test_ctx and test_fb respectively in line with the names use on the master branch. This is to make it easier to cherry pick patches from master.
2013-01-18 12:57:06 -05:00
test_utils_check_pixel (test_fb, 35, 5, 0x19334cff);
test-snippets: Split up the tests into multiple functions There were lots of tests bundled into a single long function which was becoming a bit unwieldy. It was also quite difficult to match up the test's drawing with its color test. This patch just moves each little sub test into its own function. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2012-02-10 11:33:10 -05:00
}
static void
shared_variable_pre_post (TestState *state)
{
CoglPipeline *pipeline;
CoglSnippet *snippet;
pipeline: Wrap each snippet in its own function Each snippet is now given its own function which contains the pre and post strings. Between these strings the function will chain on to another function. The generated cogl source is now stored in a function called cogl_generated_source() which the last snippet will chain on to. This should make it so that each snippet has its own namespace for local variables and it can share variables declared in the pre string in the post string. Hopefully the GLSL compiler will just inline all of the functions so it shouldn't make much difference to the compiled output. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2011-11-25 08:41:13 -05:00
/* Test that the pre string can declare variables used by the post
string */
tests: update inline with master This renames the global ctx and fb variables to test_ctx and test_fb respectively in line with the names use on the master branch. This is to make it easier to cherry pick patches from master.
2013-01-18 12:57:06 -05:00
pipeline = cogl_pipeline_new (test_ctx);
Add a conformance test for CoglSnippets This adds a conformance test testing various operations on CoglSnippets. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2011-11-17 11:52:50 -05:00
pipeline: Wrap each snippet in its own function Each snippet is now given its own function which contains the pre and post strings. Between these strings the function will chain on to another function. The generated cogl source is now stored in a function called cogl_generated_source() which the last snippet will chain on to. This should make it so that each snippet has its own namespace for local variables and it can share variables declared in the pre string in the post string. Hopefully the GLSL compiler will just inline all of the functions so it shouldn't make much difference to the compiled output. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2011-11-25 08:41:13 -05:00
cogl_pipeline_set_color4ub (pipeline, 255, 255, 255, 255);
Add a conformance test for CoglSnippets This adds a conformance test testing various operations on CoglSnippets. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2011-11-17 11:52:50 -05:00
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
snippet = cogl_snippet_new (COGL_SNIPPET_HOOK_FRAGMENT,
NULL, /* declarations */
"cogl_color_out = redvec;");
pipeline: Wrap each snippet in its own function Each snippet is now given its own function which contains the pre and post strings. Between these strings the function will chain on to another function. The generated cogl source is now stored in a function called cogl_generated_source() which the last snippet will chain on to. This should make it so that each snippet has its own namespace for local variables and it can share variables declared in the pre string in the post string. Hopefully the GLSL compiler will just inline all of the functions so it shouldn't make much difference to the compiled output. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2011-11-25 08:41:13 -05:00
cogl_snippet_set_pre (snippet, "vec4 redvec = vec4 (1.0, 0.0, 0.0, 1.0);");
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
cogl_pipeline_add_snippet (pipeline, snippet);
Add a conformance test for CoglSnippets This adds a conformance test testing various operations on CoglSnippets. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2011-11-17 11:52:50 -05:00
cogl_object_unref (snippet);
tests: update inline with master This renames the global ctx and fb variables to test_ctx and test_fb respectively in line with the names use on the master branch. This is to make it easier to cherry pick patches from master.
2013-01-18 12:57:06 -05:00
cogl_framebuffer_draw_rectangle (test_fb, pipeline, 40, 0, 50, 10);
Add a conformance test for CoglSnippets This adds a conformance test testing various operations on CoglSnippets. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2011-11-17 11:52:50 -05:00
cogl_object_unref (pipeline);
tests: update inline with master This renames the global ctx and fb variables to test_ctx and test_fb respectively in line with the names use on the master branch. This is to make it easier to cherry pick patches from master.
2013-01-18 12:57:06 -05:00
test_utils_check_pixel (test_fb, 45, 5, 0xff0000ff);
test-snippets: Split up the tests into multiple functions There were lots of tests bundled into a single long function which was becoming a bit unwieldy. It was also quite difficult to match up the test's drawing with its color test. This patch just moves each little sub test into its own function. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2012-02-10 11:33:10 -05:00
}
static void
test_pipeline_caching (TestState *state)
{
CoglPipeline *pipeline;
CoglSnippet *snippet;
Add a conformance test for CoglSnippets This adds a conformance test testing various operations on CoglSnippets. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2011-11-17 11:52:50 -05:00
/* Check that the pipeline caching works when unrelated pipelines
share snippets state. It's too hard to actually assert this in
the conformance test but at least it should be possible to see by
setting COGL_DEBUG=show-source to check whether this shader gets
generated twice */
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
snippet = cogl_snippet_new (COGL_SNIPPET_HOOK_FRAGMENT,
"/* This comment should only be seen ONCE\n"
Add a conformance test for CoglSnippets This adds a conformance test testing various operations on CoglSnippets. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2011-11-17 11:52:50 -05:00
" when COGL_DEBUG=show-source is TRUE\n"
" even though it is used in two different\n"
" unrelated pipelines */",
"cogl_color_out = vec4 (0.0, 1.0, 0.0, 1.0);\n");
tests: update inline with master This renames the global ctx and fb variables to test_ctx and test_fb respectively in line with the names use on the master branch. This is to make it easier to cherry pick patches from master.
2013-01-18 12:57:06 -05:00
pipeline = cogl_pipeline_new (test_ctx);
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
cogl_pipeline_add_snippet (pipeline, snippet);
tests: update inline with master This renames the global ctx and fb variables to test_ctx and test_fb respectively in line with the names use on the master branch. This is to make it easier to cherry pick patches from master.
2013-01-18 12:57:06 -05:00
cogl_framebuffer_draw_rectangle (test_fb, pipeline, 50, 0, 60, 10);
Add a conformance test for CoglSnippets This adds a conformance test testing various operations on CoglSnippets. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2011-11-17 11:52:50 -05:00
cogl_object_unref (pipeline);
tests: update inline with master This renames the global ctx and fb variables to test_ctx and test_fb respectively in line with the names use on the master branch. This is to make it easier to cherry pick patches from master.
2013-01-18 12:57:06 -05:00
pipeline = cogl_pipeline_new (test_ctx);
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
cogl_pipeline_add_snippet (pipeline, snippet);
tests: update inline with master This renames the global ctx and fb variables to test_ctx and test_fb respectively in line with the names use on the master branch. This is to make it easier to cherry pick patches from master.
2013-01-18 12:57:06 -05:00
cogl_framebuffer_draw_rectangle (test_fb, pipeline, 60, 0, 70, 10);
Add a conformance test for CoglSnippets This adds a conformance test testing various operations on CoglSnippets. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2011-11-17 11:52:50 -05:00
cogl_object_unref (pipeline);
cogl_object_unref (snippet);
tests: update inline with master This renames the global ctx and fb variables to test_ctx and test_fb respectively in line with the names use on the master branch. This is to make it easier to cherry pick patches from master.
2013-01-18 12:57:06 -05:00
test_utils_check_pixel (test_fb, 55, 5, 0x00ff00ff);
test_utils_check_pixel (test_fb, 65, 5, 0x00ff00ff);
test-snippets: Split up the tests into multiple functions There were lots of tests bundled into a single long function which was becoming a bit unwieldy. It was also quite difficult to match up the test's drawing with its color test. This patch just moves each little sub test into its own function. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2012-02-10 11:33:10 -05:00
}
static void
test_replace_string (TestState *state)
{
CoglPipeline *pipeline;
CoglSnippet *snippet;
snippet: Add a 'replace' string If present, the 'replace' string will be used instead of whatever code would normally be invoked for that hook point. It will also replace any previous snippets. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2011-11-25 09:36:31 -05:00
/* Check the replace string */
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
snippet = cogl_snippet_new (COGL_SNIPPET_HOOK_FRAGMENT, NULL, NULL);
snippet: Add a 'replace' string If present, the 'replace' string will be used instead of whatever code would normally be invoked for that hook point. It will also replace any previous snippets. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2011-11-25 09:36:31 -05:00
cogl_snippet_set_pre (snippet,
"cogl_color_out = vec4 (0.0, 0.5, 0.0, 1.0);");
/* Remove the generated output. If the replace string isn't working
then the code from the pre string would get overwritten with
white */
cogl_snippet_set_replace (snippet, "/* do nothing */");
cogl_snippet_set_post (snippet,
"cogl_color_out += vec4 (0.5, 0.0, 0.0, 1.0);");
tests: update inline with master This renames the global ctx and fb variables to test_ctx and test_fb respectively in line with the names use on the master branch. This is to make it easier to cherry pick patches from master.
2013-01-18 12:57:06 -05:00
pipeline = cogl_pipeline_new (test_ctx);
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
cogl_pipeline_add_snippet (pipeline, snippet);
tests: update inline with master This renames the global ctx and fb variables to test_ctx and test_fb respectively in line with the names use on the master branch. This is to make it easier to cherry pick patches from master.
2013-01-18 12:57:06 -05:00
cogl_framebuffer_draw_rectangle (test_fb, pipeline, 70, 0, 80, 10);
snippet: Add a 'replace' string If present, the 'replace' string will be used instead of whatever code would normally be invoked for that hook point. It will also replace any previous snippets. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2011-11-25 09:36:31 -05:00
cogl_object_unref (pipeline);
cogl_object_unref (snippet);
tests: update inline with master This renames the global ctx and fb variables to test_ctx and test_fb respectively in line with the names use on the master branch. This is to make it easier to cherry pick patches from master.
2013-01-18 12:57:06 -05:00
test_utils_check_pixel (test_fb, 75, 5, 0x808000ff);
test-snippets: Split up the tests into multiple functions There were lots of tests bundled into a single long function which was becoming a bit unwieldy. It was also quite difficult to match up the test's drawing with its color test. This patch just moves each little sub test into its own function. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2012-02-10 11:33:10 -05:00
}
static void
test_texture_lookup_hook (TestState *state)
{
CoglPipeline *pipeline;
CoglSnippet *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
/* Check the texture lookup hook */
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
snippet = cogl_snippet_new (COGL_SNIPPET_HOOK_TEXTURE_LOOKUP,
NULL,
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_texel.b += 1.0;");
/* Flip the texture coordinates around the y axis so that it will
get the green texel */
cogl_snippet_set_pre (snippet, "cogl_tex_coord.x = 1.0 - cogl_tex_coord.x;");
Adds a context arg to cogl_pipeline_new() As we move towards Cogl 2.0 we are aiming to remove the need for a default global CoglContext and so everything should be explicitly related to a context somehow. CoglPipelines are top level objects and so this patch adds a context argument to cogl_pipeline_new(). Reviewed-by: Neil Roberts <neil@linux.intel.com>
2012-02-18 11:03:10 -05:00
pipeline = create_texture_pipeline (state);
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
cogl_pipeline_add_layer_snippet (pipeline, 0, snippet);
tests: update inline with master This renames the global ctx and fb variables to test_ctx and test_fb respectively in line with the names use on the master branch. This is to make it easier to cherry pick patches from master.
2013-01-18 12:57:06 -05:00
cogl_framebuffer_draw_textured_rectangle (test_fb,
Adds cogl_framebuffer_draw_[*_]rectangle functions This adds experimental 2.0 api replacements for the cogl_rectangle[_*] functions that don't depend on having a current pipeline set on the context via cogl_{set,push}_source() or having a current framebuffer set on the context via cogl_push_framebuffer(). The aim for 2.0 is to switch away from having a statefull context that affects drawing to having framebuffer drawing apis that are explicitly passed a framebuffer and pipeline. To test this change several of the conformance tests were updated to use this api instead of cogl_rectangle and cogl_rectangle_with_texture_coords. Since it's quite laborious going through all of the conformance tests the opportunity was taken to make other clean ups in the conformance tests to replace other uses of 1.x api with experimental 2.0 api so long as that didn't affect what was being tested.
2012-03-16 15:54:13 -04:00
pipeline,
80, 0, 90, 10,
0, 0, 0, 0);
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_object_unref (pipeline);
cogl_object_unref (snippet);
tests: update inline with master This renames the global ctx and fb variables to test_ctx and test_fb respectively in line with the names use on the master branch. This is to make it easier to cherry pick patches from master.
2013-01-18 12:57:06 -05:00
test_utils_check_pixel (test_fb, 85, 5, 0x00ffffff);
test-snippets: Split up the tests into multiple functions There were lots of tests bundled into a single long function which was becoming a bit unwieldy. It was also quite difficult to match up the test's drawing with its color test. This patch just moves each little sub test into its own function. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2012-02-10 11:33:10 -05:00
}
test-snippets: Add a test for using cogl_sampler in tex hook This adds a test for doing custom sampling using the cogl_sampler variable in the texture lookup hook. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2012-02-10 11:44:57 -05:00
static void
test_multiple_samples (TestState *state)
{
CoglPipeline *pipeline;
CoglSnippet *snippet;
/* Check that we can use the passed in sampler in the texture lookup
to sample multiple times */
snippet = cogl_snippet_new (COGL_SNIPPET_HOOK_TEXTURE_LOOKUP,
NULL,
NULL);
cogl_snippet_set_replace (snippet,
"cogl_texel = "
"texture2D (cogl_sampler, vec2 (0.25, 0.25)) + "
"texture2D (cogl_sampler, vec2 (0.75, 0.25));");
Adds a context arg to cogl_pipeline_new() As we move towards Cogl 2.0 we are aiming to remove the need for a default global CoglContext and so everything should be explicitly related to a context somehow. CoglPipelines are top level objects and so this patch adds a context argument to cogl_pipeline_new(). Reviewed-by: Neil Roberts <neil@linux.intel.com>
2012-02-18 11:03:10 -05:00
pipeline = create_texture_pipeline (state);
test-snippets: Add a test for using cogl_sampler in tex hook This adds a test for doing custom sampling using the cogl_sampler variable in the texture lookup hook. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2012-02-10 11:44:57 -05:00
cogl_pipeline_add_layer_snippet (pipeline, 0, snippet);
tests: update inline with master This renames the global ctx and fb variables to test_ctx and test_fb respectively in line with the names use on the master branch. This is to make it easier to cherry pick patches from master.
2013-01-18 12:57:06 -05:00
cogl_framebuffer_draw_rectangle (test_fb, pipeline, 0, 0, 10, 10);
test-snippets: Add a test for using cogl_sampler in tex hook This adds a test for doing custom sampling using the cogl_sampler variable in the texture lookup hook. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2012-02-10 11:44:57 -05:00
cogl_object_unref (pipeline);
cogl_object_unref (snippet);
tests: update inline with master This renames the global ctx and fb variables to test_ctx and test_fb respectively in line with the names use on the master branch. This is to make it easier to cherry pick patches from master.
2013-01-18 12:57:06 -05:00
test_utils_check_pixel (test_fb, 5, 5, 0xffff00ff);
test-snippets: Add a test for using cogl_sampler in tex hook This adds a test for doing custom sampling using the cogl_sampler variable in the texture lookup hook. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2012-02-10 11:44:57 -05:00
}
test-snippets: Split up the tests into multiple functions There were lots of tests bundled into a single long function which was becoming a bit unwieldy. It was also quite difficult to match up the test's drawing with its color test. This patch just moves each little sub test into its own function. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2012-02-10 11:33:10 -05:00
static void
test_replace_lookup_hook (TestState *state)
{
CoglPipeline *pipeline;
CoglSnippet *snippet;
fragend-glsl: Don't generate the default texture lookup if replaced Previously the function containing the default texture lookup is always generated regardless of whether there is a snippet with a replace string which would cause it not be used. Now this snippets are all scanned to check for replace strings before generating the texture lookup. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2011-11-25 17:02:53 -05:00
/* Check replacing the texture lookup hook */
snippet = cogl_snippet_new (COGL_SNIPPET_HOOK_TEXTURE_LOOKUP, NULL, NULL);
cogl_snippet_set_replace (snippet, "cogl_texel = vec4 (0.0, 0.0, 1.0, 0.0);");
Adds a context arg to cogl_pipeline_new() As we move towards Cogl 2.0 we are aiming to remove the need for a default global CoglContext and so everything should be explicitly related to a context somehow. CoglPipelines are top level objects and so this patch adds a context argument to cogl_pipeline_new(). Reviewed-by: Neil Roberts <neil@linux.intel.com>
2012-02-18 11:03:10 -05:00
pipeline = create_texture_pipeline (state);
fragend-glsl: Don't generate the default texture lookup if replaced Previously the function containing the default texture lookup is always generated regardless of whether there is a snippet with a replace string which would cause it not be used. Now this snippets are all scanned to check for replace strings before generating the texture lookup. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2011-11-25 17:02:53 -05:00
cogl_pipeline_add_layer_snippet (pipeline, 0, snippet);
tests: update inline with master This renames the global ctx and fb variables to test_ctx and test_fb respectively in line with the names use on the master branch. This is to make it easier to cherry pick patches from master.
2013-01-18 12:57:06 -05:00
cogl_framebuffer_draw_textured_rectangle (test_fb,
Adds cogl_framebuffer_draw_[*_]rectangle functions This adds experimental 2.0 api replacements for the cogl_rectangle[_*] functions that don't depend on having a current pipeline set on the context via cogl_{set,push}_source() or having a current framebuffer set on the context via cogl_push_framebuffer(). The aim for 2.0 is to switch away from having a statefull context that affects drawing to having framebuffer drawing apis that are explicitly passed a framebuffer and pipeline. To test this change several of the conformance tests were updated to use this api instead of cogl_rectangle and cogl_rectangle_with_texture_coords. Since it's quite laborious going through all of the conformance tests the opportunity was taken to make other clean ups in the conformance tests to replace other uses of 1.x api with experimental 2.0 api so long as that didn't affect what was being tested.
2012-03-16 15:54:13 -04:00
pipeline,
90, 0, 100, 10,
0, 0, 0, 0);
fragend-glsl: Don't generate the default texture lookup if replaced Previously the function containing the default texture lookup is always generated regardless of whether there is a snippet with a replace string which would cause it not be used. Now this snippets are all scanned to check for replace strings before generating the texture lookup. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2011-11-25 17:02:53 -05:00
cogl_object_unref (pipeline);
cogl_object_unref (snippet);
tests: update inline with master This renames the global ctx and fb variables to test_ctx and test_fb respectively in line with the names use on the master branch. This is to make it easier to cherry pick patches from master.
2013-01-18 12:57:06 -05:00
test_utils_check_pixel (test_fb, 95, 5, 0x0000ffff);
test-snippets: Split up the tests into multiple functions There were lots of tests bundled into a single long function which was becoming a bit unwieldy. It was also quite difficult to match up the test's drawing with its color test. This patch just moves each little sub test into its own function. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2012-02-10 11:33:10 -05:00
}
static void
test_replace_snippet (TestState *state)
{
CoglPipeline *pipeline;
CoglSnippet *snippet;
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
/* Test replacing a previous snippet */
Adds a context arg to cogl_pipeline_new() As we move towards Cogl 2.0 we are aiming to remove the need for a default global CoglContext and so everything should be explicitly related to a context somehow. CoglPipelines are top level objects and so this patch adds a context argument to cogl_pipeline_new(). Reviewed-by: Neil Roberts <neil@linux.intel.com>
2012-02-18 11:03:10 -05:00
pipeline = create_texture_pipeline (state);
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
snippet = cogl_snippet_new (COGL_SNIPPET_HOOK_FRAGMENT,
NULL,
"cogl_color_out = vec4 (0.5, 0.5, 0.5, 1.0);");
cogl_pipeline_add_snippet (pipeline, snippet);
cogl_object_unref (snippet);
snippet = cogl_snippet_new (COGL_SNIPPET_HOOK_FRAGMENT, NULL, NULL);
cogl_snippet_set_pre (snippet, "cogl_color_out = vec4 (1.0, 1.0, 1.0, 1.0);");
cogl_snippet_set_replace (snippet,
"cogl_color_out *= vec4 (1.0, 0.0, 0.0, 1.0);");
cogl_pipeline_add_snippet (pipeline, snippet);
cogl_object_unref (snippet);
tests: update inline with master This renames the global ctx and fb variables to test_ctx and test_fb respectively in line with the names use on the master branch. This is to make it easier to cherry pick patches from master.
2013-01-18 12:57:06 -05:00
cogl_framebuffer_draw_textured_rectangle (test_fb,
Adds cogl_framebuffer_draw_[*_]rectangle functions This adds experimental 2.0 api replacements for the cogl_rectangle[_*] functions that don't depend on having a current pipeline set on the context via cogl_{set,push}_source() or having a current framebuffer set on the context via cogl_push_framebuffer(). The aim for 2.0 is to switch away from having a statefull context that affects drawing to having framebuffer drawing apis that are explicitly passed a framebuffer and pipeline. To test this change several of the conformance tests were updated to use this api instead of cogl_rectangle and cogl_rectangle_with_texture_coords. Since it's quite laborious going through all of the conformance tests the opportunity was taken to make other clean ups in the conformance tests to replace other uses of 1.x api with experimental 2.0 api so long as that didn't affect what was being tested.
2012-03-16 15:54:13 -04:00
pipeline,
100, 0, 110, 10,
0, 0, 0, 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
cogl_object_unref (pipeline);
tests: update inline with master This renames the global ctx and fb variables to test_ctx and test_fb respectively in line with the names use on the master branch. This is to make it easier to cherry pick patches from master.
2013-01-18 12:57:06 -05:00
test_utils_check_pixel (test_fb, 105, 5, 0xff0000ff);
test-snippets: Split up the tests into multiple functions There were lots of tests bundled into a single long function which was becoming a bit unwieldy. It was also quite difficult to match up the test's drawing with its color test. This patch just moves each little sub test into its own function. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2012-02-10 11:33:10 -05:00
}
static void
test_replace_fragment_layer (TestState *state)
{
CoglPipeline *pipeline;
CoglSnippet *snippet;
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
/* Test replacing the fragment layer code */
Adds a context arg to cogl_pipeline_new() As we move towards Cogl 2.0 we are aiming to remove the need for a default global CoglContext and so everything should be explicitly related to a context somehow. CoglPipelines are top level objects and so this patch adds a context argument to cogl_pipeline_new(). Reviewed-by: Neil Roberts <neil@linux.intel.com>
2012-02-18 11:03:10 -05:00
pipeline = create_texture_pipeline (state);
snippet: Add a hook for the layer fragment processing This adds a hook to replace or wrap the fragment processing for a particular layer. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2011-11-25 18:16:31 -05:00
snippet = cogl_snippet_new (COGL_SNIPPET_HOOK_LAYER_FRAGMENT, NULL, NULL);
cogl_snippet_set_replace (snippet, "cogl_layer = vec4 (0.0, 0.0, 1.0, 1.0);");
cogl_pipeline_add_layer_snippet (pipeline, 0, snippet);
cogl_object_unref (snippet);
/* Add a second layer which samples from the texture in the first
layer. The snippet override should cause the first layer not to
generate the code for the texture lookup but this second layer
should still be able to cause it to be generated */
cogl_pipeline_set_layer_combine (pipeline, 1,
"RGB = ADD(TEXTURE_0, PREVIOUS)"
"A = REPLACE(PREVIOUS)",
NULL);
tests: update inline with master This renames the global ctx and fb variables to test_ctx and test_fb respectively in line with the names use on the master branch. This is to make it easier to cherry pick patches from master.
2013-01-18 12:57:06 -05:00
cogl_framebuffer_draw_textured_rectangle (test_fb,
Adds cogl_framebuffer_draw_[*_]rectangle functions This adds experimental 2.0 api replacements for the cogl_rectangle[_*] functions that don't depend on having a current pipeline set on the context via cogl_{set,push}_source() or having a current framebuffer set on the context via cogl_push_framebuffer(). The aim for 2.0 is to switch away from having a statefull context that affects drawing to having framebuffer drawing apis that are explicitly passed a framebuffer and pipeline. To test this change several of the conformance tests were updated to use this api instead of cogl_rectangle and cogl_rectangle_with_texture_coords. Since it's quite laborious going through all of the conformance tests the opportunity was taken to make other clean ups in the conformance tests to replace other uses of 1.x api with experimental 2.0 api so long as that didn't affect what was being tested.
2012-03-16 15:54:13 -04:00
pipeline,
110, 0, 120, 10,
0, 0, 0, 0);
snippet: Add a hook for the layer fragment processing This adds a hook to replace or wrap the fragment processing for a particular layer. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2011-11-25 18:16:31 -05:00
cogl_object_unref (pipeline);
tests: update inline with master This renames the global ctx and fb variables to test_ctx and test_fb respectively in line with the names use on the master branch. This is to make it easier to cherry pick patches from master.
2013-01-18 12:57:06 -05:00
test_utils_check_pixel (test_fb, 115, 5, 0xff00ffff);
test-snippets: Split up the tests into multiple functions There were lots of tests bundled into a single long function which was becoming a bit unwieldy. It was also quite difficult to match up the test's drawing with its color test. This patch just moves each little sub test into its own function. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2012-02-10 11:33:10 -05:00
}
static void
test_modify_fragment_layer (TestState *state)
{
CoglPipeline *pipeline;
CoglSnippet *snippet;
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
/* Test modifying the fragment layer code */
tests: update inline with master This renames the global ctx and fb variables to test_ctx and test_fb respectively in line with the names use on the master branch. This is to make it easier to cherry pick patches from master.
2013-01-18 12:57:06 -05:00
pipeline = cogl_pipeline_new (test_ctx);
snippet: Add a hook for the layer fragment processing This adds a hook to replace or wrap the fragment processing for a particular layer. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2011-11-25 18:16:31 -05:00
cogl_pipeline_set_uniform_1f (pipeline,
cogl_pipeline_get_uniform_location (pipeline,
"a_value"),
0.5);
snippet = cogl_snippet_new (COGL_SNIPPET_HOOK_LAYER_FRAGMENT,
"uniform float a_value;",
"cogl_layer.g = a_value;");
cogl_pipeline_add_layer_snippet (pipeline, 0, snippet);
cogl_object_unref (snippet);
tests: update inline with master This renames the global ctx and fb variables to test_ctx and test_fb respectively in line with the names use on the master branch. This is to make it easier to cherry pick patches from master.
2013-01-18 12:57:06 -05:00
cogl_framebuffer_draw_textured_rectangle (test_fb,
Adds cogl_framebuffer_draw_[*_]rectangle functions This adds experimental 2.0 api replacements for the cogl_rectangle[_*] functions that don't depend on having a current pipeline set on the context via cogl_{set,push}_source() or having a current framebuffer set on the context via cogl_push_framebuffer(). The aim for 2.0 is to switch away from having a statefull context that affects drawing to having framebuffer drawing apis that are explicitly passed a framebuffer and pipeline. To test this change several of the conformance tests were updated to use this api instead of cogl_rectangle and cogl_rectangle_with_texture_coords. Since it's quite laborious going through all of the conformance tests the opportunity was taken to make other clean ups in the conformance tests to replace other uses of 1.x api with experimental 2.0 api so long as that didn't affect what was being tested.
2012-03-16 15:54:13 -04:00
pipeline,
120, 0, 130, 10,
0, 0, 0, 0);
snippet: Add a hook for the layer fragment processing This adds a hook to replace or wrap the fragment processing for a particular layer. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2011-11-25 18:16:31 -05:00
cogl_object_unref (pipeline);
tests: update inline with master This renames the global ctx and fb variables to test_ctx and test_fb respectively in line with the names use on the master branch. This is to make it easier to cherry pick patches from master.
2013-01-18 12:57:06 -05:00
test_utils_check_pixel (test_fb, 125, 5, 0xff80ffff);
test-snippets: Split up the tests into multiple functions There were lots of tests bundled into a single long function which was becoming a bit unwieldy. It was also quite difficult to match up the test's drawing with its color test. This patch just moves each little sub test into its own function. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2012-02-10 11:33:10 -05:00
}
static void
test_modify_vertex_layer (TestState *state)
{
CoglPipeline *pipeline;
CoglSnippet *snippet;
CoglMatrix matrix;
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
/* Test modifying the vertex layer code */
Adds a context arg to cogl_pipeline_new() As we move towards Cogl 2.0 we are aiming to remove the need for a default global CoglContext and so everything should be explicitly related to a context somehow. CoglPipelines are top level objects and so this patch adds a context argument to cogl_pipeline_new(). Reviewed-by: Neil Roberts <neil@linux.intel.com>
2012-02-18 11:03:10 -05:00
pipeline = create_texture_pipeline (state);
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
cogl_matrix_init_identity (&matrix);
cogl_matrix_translate (&matrix, 0.0f, 1.0f, 0.0f);
cogl_pipeline_set_layer_matrix (pipeline, 0, &matrix);
snippet = cogl_snippet_new (COGL_SNIPPET_HOOK_TEXTURE_COORD_TRANSFORM,
NULL,
"cogl_tex_coord.x = 1.0;");
cogl_pipeline_add_layer_snippet (pipeline, 0, snippet);
cogl_object_unref (snippet);
tests: update inline with master This renames the global ctx and fb variables to test_ctx and test_fb respectively in line with the names use on the master branch. This is to make it easier to cherry pick patches from master.
2013-01-18 12:57:06 -05:00
cogl_framebuffer_draw_textured_rectangle (test_fb,
Adds cogl_framebuffer_draw_[*_]rectangle functions This adds experimental 2.0 api replacements for the cogl_rectangle[_*] functions that don't depend on having a current pipeline set on the context via cogl_{set,push}_source() or having a current framebuffer set on the context via cogl_push_framebuffer(). The aim for 2.0 is to switch away from having a statefull context that affects drawing to having framebuffer drawing apis that are explicitly passed a framebuffer and pipeline. To test this change several of the conformance tests were updated to use this api instead of cogl_rectangle and cogl_rectangle_with_texture_coords. Since it's quite laborious going through all of the conformance tests the opportunity was taken to make other clean ups in the conformance tests to replace other uses of 1.x api with experimental 2.0 api so long as that didn't affect what was being tested.
2012-03-16 15:54:13 -04:00
pipeline,
130, 0, 140, 10,
0, 0, 0, 0);
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
cogl_object_unref (pipeline);
tests: update inline with master This renames the global ctx and fb variables to test_ctx and test_fb respectively in line with the names use on the master branch. This is to make it easier to cherry pick patches from master.
2013-01-18 12:57:06 -05:00
test_utils_check_pixel (test_fb, 135, 5, 0xffff00ff);
test-snippets: Split up the tests into multiple functions There were lots of tests bundled into a single long function which was becoming a bit unwieldy. It was also quite difficult to match up the test's drawing with its color test. This patch just moves each little sub test into its own function. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2012-02-10 11:33:10 -05:00
}
static void
test_replace_vertex_layer (TestState *state)
{
CoglPipeline *pipeline;
CoglSnippet *snippet;
CoglMatrix matrix;
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
/* Test replacing the vertex layer code */
Adds a context arg to cogl_pipeline_new() As we move towards Cogl 2.0 we are aiming to remove the need for a default global CoglContext and so everything should be explicitly related to a context somehow. CoglPipelines are top level objects and so this patch adds a context argument to cogl_pipeline_new(). Reviewed-by: Neil Roberts <neil@linux.intel.com>
2012-02-18 11:03:10 -05:00
pipeline = create_texture_pipeline (state);
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
cogl_matrix_init_identity (&matrix);
cogl_matrix_translate (&matrix, 0.0f, 1.0f, 0.0f);
cogl_pipeline_set_layer_matrix (pipeline, 0, &matrix);
snippet = cogl_snippet_new (COGL_SNIPPET_HOOK_TEXTURE_COORD_TRANSFORM,
NULL,
NULL);
cogl_snippet_set_replace (snippet, "cogl_tex_coord.x = 1.0;\n");
cogl_pipeline_add_layer_snippet (pipeline, 0, snippet);
cogl_object_unref (snippet);
tests: update inline with master This renames the global ctx and fb variables to test_ctx and test_fb respectively in line with the names use on the master branch. This is to make it easier to cherry pick patches from master.
2013-01-18 12:57:06 -05:00
cogl_framebuffer_draw_textured_rectangle (test_fb,
Adds cogl_framebuffer_draw_[*_]rectangle functions This adds experimental 2.0 api replacements for the cogl_rectangle[_*] functions that don't depend on having a current pipeline set on the context via cogl_{set,push}_source() or having a current framebuffer set on the context via cogl_push_framebuffer(). The aim for 2.0 is to switch away from having a statefull context that affects drawing to having framebuffer drawing apis that are explicitly passed a framebuffer and pipeline. To test this change several of the conformance tests were updated to use this api instead of cogl_rectangle and cogl_rectangle_with_texture_coords. Since it's quite laborious going through all of the conformance tests the opportunity was taken to make other clean ups in the conformance tests to replace other uses of 1.x api with experimental 2.0 api so long as that didn't affect what was being tested.
2012-03-16 15:54:13 -04:00
pipeline,
140, 0, 150, 10,
0, 0, 0, 0);
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
cogl_object_unref (pipeline);
tests: update inline with master This renames the global ctx and fb variables to test_ctx and test_fb respectively in line with the names use on the master branch. This is to make it easier to cherry pick patches from master.
2013-01-18 12:57:06 -05:00
test_utils_check_pixel (test_fb, 145, 5, 0x00ff00ff);
test-snippets: Split up the tests into multiple functions There were lots of tests bundled into a single long function which was becoming a bit unwieldy. It was also quite difficult to match up the test's drawing with its color test. This patch just moves each little sub test into its own function. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2012-02-10 11:33:10 -05:00
}
static void
test_vertex_transform_hook (TestState *state)
{
CoglPipeline *pipeline;
CoglSnippet *snippet;
CoglMatrix identity_matrix;
CoglMatrix matrix;
int location;
snippet: Add a hook for the vertex transform This adds a hook to wrap or replace the vertex transform stage. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2011-11-28 17:06:53 -05:00
/* Test the vertex transform hook */
test-snippets: Split up the tests into multiple functions There were lots of tests bundled into a single long function which was becoming a bit unwieldy. It was also quite difficult to match up the test's drawing with its color test. This patch just moves each little sub test into its own function. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2012-02-10 11:33:10 -05:00
cogl_matrix_init_identity (&identity_matrix);
tests: update inline with master This renames the global ctx and fb variables to test_ctx and test_fb respectively in line with the names use on the master branch. This is to make it easier to cherry pick patches from master.
2013-01-18 12:57:06 -05:00
pipeline = cogl_pipeline_new (test_ctx);
snippet: Add a hook for the vertex transform This adds a hook to wrap or replace the vertex transform stage. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2011-11-28 17:06:53 -05:00
cogl_pipeline_set_color4ub (pipeline, 255, 0, 255, 255);
snippet = cogl_snippet_new (COGL_SNIPPET_HOOK_VERTEX_TRANSFORM,
"uniform mat4 pmat;",
NULL);
cogl_snippet_set_replace (snippet, "cogl_position_out = "
"pmat * cogl_position_in;");
cogl_pipeline_add_snippet (pipeline, snippet);
cogl_object_unref (snippet);
/* Copy the current projection matrix to a uniform */
tests: update inline with master This renames the global ctx and fb variables to test_ctx and test_fb respectively in line with the names use on the master branch. This is to make it easier to cherry pick patches from master.
2013-01-18 12:57:06 -05:00
cogl_framebuffer_get_projection_matrix (test_fb, &matrix);
snippet: Add a hook for the vertex transform This adds a hook to wrap or replace the vertex transform stage. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2011-11-28 17:06:53 -05:00
location = cogl_pipeline_get_uniform_location (pipeline, "pmat");
cogl_pipeline_set_uniform_matrix (pipeline,
location,
4, /* dimensions */
1, /* count */
FALSE, /* don't transpose */
cogl_matrix_get_array (&matrix));
/* Replace the real projection matrix with the identity. This should
mess up the drawing unless the snippet replacement is working */
tests: update inline with master This renames the global ctx and fb variables to test_ctx and test_fb respectively in line with the names use on the master branch. This is to make it easier to cherry pick patches from master.
2013-01-18 12:57:06 -05:00
cogl_framebuffer_set_projection_matrix (test_fb, &identity_matrix);
snippet: Add a hook for the vertex transform This adds a hook to wrap or replace the vertex transform stage. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2011-11-28 17:06:53 -05:00
tests: update inline with master This renames the global ctx and fb variables to test_ctx and test_fb respectively in line with the names use on the master branch. This is to make it easier to cherry pick patches from master.
2013-01-18 12:57:06 -05:00
cogl_framebuffer_draw_rectangle (test_fb, pipeline, 150, 0, 160, 10);
snippet: Add a hook for the vertex transform This adds a hook to wrap or replace the vertex transform stage. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2011-11-28 17:06:53 -05:00
cogl_object_unref (pipeline);
/* Restore the projection matrix */
tests: update inline with master This renames the global ctx and fb variables to test_ctx and test_fb respectively in line with the names use on the master branch. This is to make it easier to cherry pick patches from master.
2013-01-18 12:57:06 -05:00
cogl_framebuffer_set_projection_matrix (test_fb, &matrix);
snippet: Add a hook for the vertex transform This adds a hook to wrap or replace the vertex transform stage. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2011-11-28 17:06:53 -05:00
tests: update inline with master This renames the global ctx and fb variables to test_ctx and test_fb respectively in line with the names use on the master branch. This is to make it easier to cherry pick patches from master.
2013-01-18 12:57:06 -05:00
test_utils_check_pixel (test_fb, 155, 5, 0xff00ffff);
test-snippets: Split up the tests into multiple functions There were lots of tests bundled into a single long function which was becoming a bit unwieldy. It was also quite difficult to match up the test's drawing with its color test. This patch just moves each little sub test into its own function. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2012-02-10 11:33:10 -05:00
}
static void
test_snippet_order (TestState *state)
{
CoglPipeline *pipeline;
CoglSnippet *snippet;
test-snippets: Add a test to verify the order of the snippets This verifies that the post strings are executed in the order they were added to the pipeline and the post strings are executed in the reverse order. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2011-12-06 07:14:07 -05:00
/* Verify that the snippets are executed in the right order. We'll
replace the r component of the color in the pre sections of the
snippets and the g component in the post. The pre sections should
be executed in the reverse order they were added and the post
sections in the same order as they were added. Therefore the r
component should be taken from the the second snippet and the g
component from the first */
tests: update inline with master This renames the global ctx and fb variables to test_ctx and test_fb respectively in line with the names use on the master branch. This is to make it easier to cherry pick patches from master.
2013-01-18 12:57:06 -05:00
pipeline = cogl_pipeline_new (test_ctx);
test-snippets: Add a test to verify the order of the snippets This verifies that the post strings are executed in the order they were added to the pipeline and the post strings are executed in the reverse order. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2011-12-06 07:14:07 -05:00
cogl_pipeline_set_color4ub (pipeline, 0, 0, 0, 255);
snippet = cogl_snippet_new (COGL_SNIPPET_HOOK_FRAGMENT,
NULL,
"cogl_color_out.g = 0.5;\n");
cogl_snippet_set_pre (snippet, "cogl_color_out.r = 0.5;\n");
cogl_snippet_set_replace (snippet, "cogl_color_out.ba = vec2 (0.0, 1.0);");
cogl_pipeline_add_snippet (pipeline, snippet);
cogl_object_unref (snippet);
snippet = cogl_snippet_new (COGL_SNIPPET_HOOK_FRAGMENT,
NULL,
"cogl_color_out.g = 1.0;\n");
cogl_snippet_set_pre (snippet, "cogl_color_out.r = 1.0;\n");
cogl_pipeline_add_snippet (pipeline, snippet);
cogl_object_unref (snippet);
tests: update inline with master This renames the global ctx and fb variables to test_ctx and test_fb respectively in line with the names use on the master branch. This is to make it easier to cherry pick patches from master.
2013-01-18 12:57:06 -05:00
cogl_framebuffer_draw_rectangle (test_fb, pipeline, 160, 0, 170, 10);
test-snippets: Add a test to verify the order of the snippets This verifies that the post strings are executed in the order they were added to the pipeline and the post strings are executed in the reverse order. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2011-12-06 07:14:07 -05:00
cogl_object_unref (pipeline);
tests: update inline with master This renames the global ctx and fb variables to test_ctx and test_fb respectively in line with the names use on the master branch. This is to make it easier to cherry pick patches from master.
2013-01-18 12:57:06 -05:00
test_utils_check_pixel (test_fb, 165, 5, 0x80ff00ff);
test-snippets: Split up the tests into multiple functions There were lots of tests bundled into a single long function which was becoming a bit unwieldy. It was also quite difficult to match up the test's drawing with its color test. This patch just moves each little sub test into its own function. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2012-02-10 11:33:10 -05:00
}
test-snippets: Add a test case for sampling arbitrary units This adds a sub-test that samples from two texture units by naming their layer numbers. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2012-02-10 11:58:31 -05:00
static void
test_naming_texture_units (TestState *state)
{
CoglPipeline *pipeline;
CoglSnippet *snippet;
CoglTexture *tex1, *tex2;
/* Test that we can sample from an arbitrary texture unit by naming
its layer number */
snippet = cogl_snippet_new (COGL_SNIPPET_HOOK_FRAGMENT,
NULL,
NULL);
cogl_snippet_set_replace (snippet,
"cogl_color_out = "
"texture2D (cogl_sampler100, vec2 (0.0, 0.0)) + "
"texture2D (cogl_sampler200, vec2 (0.0, 0.0));");
tests: update inline with master This renames the global ctx and fb variables to test_ctx and test_fb respectively in line with the names use on the master branch. This is to make it easier to cherry pick patches from master.
2013-01-18 12:57:06 -05:00
tex1 = test_utils_create_color_texture (test_ctx, 0xff0000ff);
tex2 = test_utils_create_color_texture (test_ctx, 0x00ff00ff);
test-snippets: Add a test case for sampling arbitrary units This adds a sub-test that samples from two texture units by naming their layer numbers. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2012-02-10 11:58:31 -05:00
tests: update inline with master This renames the global ctx and fb variables to test_ctx and test_fb respectively in line with the names use on the master branch. This is to make it easier to cherry pick patches from master.
2013-01-18 12:57:06 -05:00
pipeline = cogl_pipeline_new (test_ctx);
test-snippets: Add a test case for sampling arbitrary units This adds a sub-test that samples from two texture units by naming their layer numbers. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2012-02-10 11:58:31 -05:00
cogl_pipeline_set_layer_texture (pipeline, 100, tex1);
cogl_pipeline_set_layer_texture (pipeline, 200, tex2);
cogl_pipeline_add_snippet (pipeline, snippet);
tests: update inline with master This renames the global ctx and fb variables to test_ctx and test_fb respectively in line with the names use on the master branch. This is to make it easier to cherry pick patches from master.
2013-01-18 12:57:06 -05:00
cogl_framebuffer_draw_rectangle (test_fb, pipeline, 0, 0, 10, 10);
test-snippets: Add a test case for sampling arbitrary units This adds a sub-test that samples from two texture units by naming their layer numbers. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2012-02-10 11:58:31 -05:00
cogl_object_unref (pipeline);
cogl_object_unref (snippet);
cogl_object_unref (tex1);
cogl_object_unref (tex2);
tests: update inline with master This renames the global ctx and fb variables to test_ctx and test_fb respectively in line with the names use on the master branch. This is to make it easier to cherry pick patches from master.
2013-01-18 12:57:06 -05:00
test_utils_check_pixel (test_fb, 5, 5, 0xffff00ff);
test-snippets: Add a test case for sampling arbitrary units This adds a sub-test that samples from two texture units by naming their layer numbers. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2012-02-10 11:58:31 -05:00
}
test-snippets: Split up the tests into multiple functions There were lots of tests bundled into a single long function which was becoming a bit unwieldy. It was also quite difficult to match up the test's drawing with its color test. This patch just moves each little sub test into its own function. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2012-02-10 11:33:10 -05:00
static void
test_snippet_properties (TestState *state)
{
CoglSnippet *snippet;
Add a conformance test for CoglSnippets This adds a conformance test testing various operations on CoglSnippets. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2011-11-17 11:52:50 -05:00
/* Sanity check modifying the snippet */
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
snippet = cogl_snippet_new (COGL_SNIPPET_HOOK_FRAGMENT, "foo", "bar");
Add a conformance test for CoglSnippets This adds a conformance test testing various operations on CoglSnippets. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2011-11-17 11:52:50 -05:00
g_assert_cmpstr (cogl_snippet_get_declarations (snippet), ==, "foo");
g_assert_cmpstr (cogl_snippet_get_post (snippet), ==, "bar");
snippet: Add a 'replace' string If present, the 'replace' string will be used instead of whatever code would normally be invoked for that hook point. It will also replace any previous snippets. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2011-11-25 09:36:31 -05:00
g_assert_cmpstr (cogl_snippet_get_replace (snippet), ==, NULL);
Add a conformance test for CoglSnippets This adds a conformance test testing various operations on CoglSnippets. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2011-11-17 11:52:50 -05:00
g_assert_cmpstr (cogl_snippet_get_pre (snippet), ==, NULL);
cogl_snippet_set_declarations (snippet, "fu");
g_assert_cmpstr (cogl_snippet_get_declarations (snippet), ==, "fu");
g_assert_cmpstr (cogl_snippet_get_post (snippet), ==, "bar");
snippet: Add a 'replace' string If present, the 'replace' string will be used instead of whatever code would normally be invoked for that hook point. It will also replace any previous snippets. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2011-11-25 09:36:31 -05:00
g_assert_cmpstr (cogl_snippet_get_replace (snippet), ==, NULL);
Add a conformance test for CoglSnippets This adds a conformance test testing various operations on CoglSnippets. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2011-11-17 11:52:50 -05:00
g_assert_cmpstr (cogl_snippet_get_pre (snippet), ==, NULL);
cogl_snippet_set_post (snippet, "ba");
g_assert_cmpstr (cogl_snippet_get_declarations (snippet), ==, "fu");
g_assert_cmpstr (cogl_snippet_get_post (snippet), ==, "ba");
snippet: Add a 'replace' string If present, the 'replace' string will be used instead of whatever code would normally be invoked for that hook point. It will also replace any previous snippets. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2011-11-25 09:36:31 -05:00
g_assert_cmpstr (cogl_snippet_get_replace (snippet), ==, NULL);
Add a conformance test for CoglSnippets This adds a conformance test testing various operations on CoglSnippets. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2011-11-17 11:52:50 -05:00
g_assert_cmpstr (cogl_snippet_get_pre (snippet), ==, NULL);
cogl_snippet_set_pre (snippet, "fuba");
g_assert_cmpstr (cogl_snippet_get_declarations (snippet), ==, "fu");
g_assert_cmpstr (cogl_snippet_get_post (snippet), ==, "ba");
snippet: Add a 'replace' string If present, the 'replace' string will be used instead of whatever code would normally be invoked for that hook point. It will also replace any previous snippets. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2011-11-25 09:36:31 -05:00
g_assert_cmpstr (cogl_snippet_get_replace (snippet), ==, NULL);
g_assert_cmpstr (cogl_snippet_get_pre (snippet), ==, "fuba");
cogl_snippet_set_replace (snippet, "baba");
g_assert_cmpstr (cogl_snippet_get_declarations (snippet), ==, "fu");
g_assert_cmpstr (cogl_snippet_get_post (snippet), ==, "ba");
g_assert_cmpstr (cogl_snippet_get_replace (snippet), ==, "baba");
Add a conformance test for CoglSnippets This adds a conformance test testing various operations on CoglSnippets. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2011-11-17 11:52:50 -05:00
g_assert_cmpstr (cogl_snippet_get_pre (snippet), ==, "fuba");
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
g_assert_cmpint (cogl_snippet_get_hook (snippet),
==,
COGL_SNIPPET_HOOK_FRAGMENT);
Add a conformance test for CoglSnippets This adds a conformance test testing various operations on CoglSnippets. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2011-11-17 11:52:50 -05:00
}
test-snippets: Split up the tests into multiple functions There were lots of tests bundled into a single long function which was becoming a bit unwieldy. It was also quite difficult to match up the test's drawing with its color test. This patch just moves each little sub test into its own function. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2012-02-10 11:33:10 -05:00
static SnippetTestFunc
tests[] =
{
simple_fragment_snippet,
simple_vertex_snippet,
shared_uniform,
lots_snippets,
shared_variable_pre_post,
test_pipeline_caching,
test_replace_string,
test_texture_lookup_hook,
test-snippets: Add a test for using cogl_sampler in tex hook This adds a test for doing custom sampling using the cogl_sampler variable in the texture lookup hook. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2012-02-10 11:44:57 -05:00
test_multiple_samples,
test-snippets: Split up the tests into multiple functions There were lots of tests bundled into a single long function which was becoming a bit unwieldy. It was also quite difficult to match up the test's drawing with its color test. This patch just moves each little sub test into its own function. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2012-02-10 11:33:10 -05:00
test_replace_lookup_hook,
test_replace_snippet,
test_replace_fragment_layer,
test_modify_fragment_layer,
test_modify_vertex_layer,
test_replace_vertex_layer,
test_vertex_transform_hook,
test_snippet_order,
test-snippets: Add a test case for sampling arbitrary units This adds a sub-test that samples from two texture units by naming their layer numbers. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2012-02-10 11:58:31 -05:00
test_naming_texture_units,
test-snippets: Split up the tests into multiple functions There were lots of tests bundled into a single long function which was becoming a bit unwieldy. It was also quite difficult to match up the test's drawing with its color test. This patch just moves each little sub test into its own function. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2012-02-10 11:33:10 -05:00
test_snippet_properties
};
Add a conformance test for CoglSnippets This adds a conformance test testing various operations on CoglSnippets. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2011-11-17 11:52:50 -05:00
static void
test-snippets: Split up the tests into multiple functions There were lots of tests bundled into a single long function which was becoming a bit unwieldy. It was also quite difficult to match up the test's drawing with its color test. This patch just moves each little sub test into its own function. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2012-02-10 11:33:10 -05:00
run_tests (TestState *state)
Add a conformance test for CoglSnippets This adds a conformance test testing various operations on CoglSnippets. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2011-11-17 11:52:50 -05:00
{
test-snippets: Split up the tests into multiple functions There were lots of tests bundled into a single long function which was becoming a bit unwieldy. It was also quite difficult to match up the test's drawing with its color test. This patch just moves each little sub test into its own function. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2012-02-10 11:33:10 -05:00
int i;
for (i = 0; i < G_N_ELEMENTS (tests); i++)
{
tests: update inline with master This renames the global ctx and fb variables to test_ctx and test_fb respectively in line with the names use on the master branch. This is to make it easier to cherry pick patches from master.
2013-01-18 12:57:06 -05:00
cogl_framebuffer_clear4f (test_fb,
test-snippets: Split up the tests into multiple functions There were lots of tests bundled into a single long function which was becoming a bit unwieldy. It was also quite difficult to match up the test's drawing with its color test. This patch just moves each little sub test into its own function. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2012-02-10 11:33:10 -05:00
COGL_BUFFER_BIT_COLOR,
0, 0, 0, 1);
tests[i] (state);
}
Add a conformance test for CoglSnippets This adds a conformance test testing various operations on CoglSnippets. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2011-11-17 11:52:50 -05:00
}
void
Adds cogl_framebuffer_draw_[*_]rectangle functions This adds experimental 2.0 api replacements for the cogl_rectangle[_*] functions that don't depend on having a current pipeline set on the context via cogl_{set,push}_source() or having a current framebuffer set on the context via cogl_push_framebuffer(). The aim for 2.0 is to switch away from having a statefull context that affects drawing to having framebuffer drawing apis that are explicitly passed a framebuffer and pipeline. To test this change several of the conformance tests were updated to use this api instead of cogl_rectangle and cogl_rectangle_with_texture_coords. Since it's quite laborious going through all of the conformance tests the opportunity was taken to make other clean ups in the conformance tests to replace other uses of 1.x api with experimental 2.0 api so long as that didn't affect what was being tested.
2012-03-16 15:54:13 -04:00
test_snippets (void)
Add a conformance test for CoglSnippets This adds a conformance test testing various operations on CoglSnippets. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2011-11-17 11:52:50 -05:00
{
tests: Don't report success when the test is skipped The tests that were using GLSL or 3D textures were directly printing “Skipped” and then reporting success. Instead of doing this they now just try to continue without checking for the feature but the appropriate test requirement flag is now set in test-conform-main so the table of results will correctly display that is a failure. Reviewed-by: Robert Bragg <robert@linux.intel.com> (cherry picked from commit b8f918e44b243a5fa36d5f382a90bebb0de0728f)
2012-11-09 10:14:33 -05:00
TestState state;
Add a conformance test for CoglSnippets This adds a conformance test testing various operations on CoglSnippets. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2011-11-17 11:52:50 -05:00
tests: Don't report success when the test is skipped The tests that were using GLSL or 3D textures were directly printing “Skipped” and then reporting success. Instead of doing this they now just try to continue without checking for the feature but the appropriate test requirement flag is now set in test-conform-main so the table of results will correctly display that is a failure. Reviewed-by: Robert Bragg <robert@linux.intel.com> (cherry picked from commit b8f918e44b243a5fa36d5f382a90bebb0de0728f)
2012-11-09 10:14:33 -05:00
cogl_framebuffer_orthographic (test_fb,
0, 0,
cogl_framebuffer_get_width (test_fb),
cogl_framebuffer_get_height (test_fb),
-1,
100);
Add a conformance test for CoglSnippets This adds a conformance test testing various operations on CoglSnippets. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2011-11-17 11:52:50 -05:00
tests: Don't report success when the test is skipped The tests that were using GLSL or 3D textures were directly printing “Skipped” and then reporting success. Instead of doing this they now just try to continue without checking for the feature but the appropriate test requirement flag is now set in test-conform-main so the table of results will correctly display that is a failure. Reviewed-by: Robert Bragg <robert@linux.intel.com> (cherry picked from commit b8f918e44b243a5fa36d5f382a90bebb0de0728f)
2012-11-09 10:14:33 -05:00
run_tests (&state);
Add a conformance test for CoglSnippets This adds a conformance test testing various operations on CoglSnippets. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2011-11-17 11:52:50 -05:00
tests: Don't report success when the test is skipped The tests that were using GLSL or 3D textures were directly printing “Skipped” and then reporting success. Instead of doing this they now just try to continue without checking for the feature but the appropriate test requirement flag is now set in test-conform-main so the table of results will correctly display that is a failure. Reviewed-by: Robert Bragg <robert@linux.intel.com> (cherry picked from commit b8f918e44b243a5fa36d5f382a90bebb0de0728f)
2012-11-09 10:14:33 -05:00
if (cogl_test_verbose ())
g_print ("OK\n");
Add a conformance test for CoglSnippets This adds a conformance test testing various operations on CoglSnippets. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2011-11-17 11:52:50 -05:00
}
Reference in New Issue Copy Permalink