brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
98af9bb251
mutter/cogl/tests/conform/test-custom-attributes.c

302 lines
11 KiB
C
Raw Normal View History

Add a conformance test for custom attributes The test creates some pipelines with snippets with custom attributes and uses CoglAttribute to define values for them. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2011-12-02 05:55:41 -05:00
#include <cogl/cogl.h>
#include <string.h>
#include "test-utils.h"
typedef struct _TestState
{
CoglPipeline *pipeline;
} TestState;
typedef struct
{
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
int16_t x, y;
Add a conformance test for custom attributes The test creates some pipelines with snippets with custom attributes and uses CoglAttribute to define values for them. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2011-12-02 05:55:41 -05:00
float r, g, b, a;
} FloatVert;
typedef struct
{
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
int16_t x, y;
uint8_t r, g, b, a;
Add a conformance test for custom attributes The test creates some pipelines with snippets with custom attributes and uses CoglAttribute to define values for them. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2011-12-02 05:55:41 -05:00
} ByteVert;
typedef struct
{
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
int16_t x, y;
gl: bind position attribute to location 0 Full GL treats the position attribute specially and requires that it must be bound to generic attribute location 0 unlike GLES 2.0 or GL 3.2 core. We now make sure to unconditionally bind the cogl_position_in attribute to location 0 before linking any glsl program in cogl. For reference the relevant part of the GL 3.0 spec that covers these semantics is Section 2.7 "Vertex Specification" pg 27 After this change there was one remaining problem in test-custom-attributes where the test_short_verts() test was using its own "pos" attribute instead of cogl_position_in and so cogl wasn't able to ensure it would be bound to location 0. This updates the test to use cogl_position_in but to work around the fact that glVertexPointer doesn't support UNSIGNED_SHORT components we force the test to use the glsl backend by setting a shader snippet on the pipeline. https://bugs.freedesktop.org/show_bug.cgi?id=67548 Reviewed-by: Neil Roberts <neil@linux.intel.com> (cherry picked from commit 992ef7b3b49ebb56adde2133bb36330c04133a3f)
2013-08-16 16:23:37 -04:00
int16_t r, g, b, a;
Add a conformance test for custom attributes The test creates some pipelines with snippets with custom attributes and uses CoglAttribute to define values for them. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2011-12-02 05:55:41 -05:00
} ShortVert;
static void
test_float_verts (TestState *state, int offset_x, int offset_y)
{
CoglAttribute *attributes[2];
CoglAttributeBuffer *buffer;
framebuffer: remove attribute drawing apis Almost nothing draws attributes directly and for those things that do it's trivial to adapt them to instead draw via the cogl_primitive api. This simplifies the Cogl api a bit. Reviewed-by: Neil Roberts <neil@linux.intel.com> (cherry picked from commit 7395925bcc01aad6c695fd0d9af78b784b3c64d4) Conflicts: cogl/cogl-framebuffer.c cogl/cogl-framebuffer.h
2013-07-09 19:39:18 -04:00
CoglPrimitive *primitive;
Add a conformance test for custom attributes The test creates some pipelines with snippets with custom attributes and uses CoglAttribute to define values for them. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2011-12-02 05:55:41 -05:00
static const FloatVert float_verts[] =
{
{ 0, 10, /**/ 1, 0, 0, 1 },
{ 10, 10, /**/ 1, 0, 0, 1 },
{ 5, 0, /**/ 1, 0, 0, 1 },
{ 10, 10, /**/ 0, 1, 0, 1 },
{ 20, 10, /**/ 0, 1, 0, 1 },
{ 15, 0, /**/ 0, 1, 0, 1 }
};
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
buffer = cogl_attribute_buffer_new (test_ctx,
buffer: explicitly relate buffers to a context All CoglBuffer constructors now take an explicit CoglContext constructor. This is part of the on going effort to adapt to Cogl API so it no longer depends on a global, default context. Reviewed-by: Neil Roberts <neil@linux.intel.com>
2012-02-06 12:08:58 -05:00
sizeof (float_verts), float_verts);
Add a conformance test for custom attributes The test creates some pipelines with snippets with custom attributes and uses CoglAttribute to define values for them. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2011-12-02 05:55:41 -05:00
attributes[0] = cogl_attribute_new (buffer,
"cogl_position_in",
sizeof (FloatVert),
G_STRUCT_OFFSET (FloatVert, x),
2, /* n_components */
COGL_ATTRIBUTE_TYPE_SHORT);
attributes[1] = cogl_attribute_new (buffer,
"color",
sizeof (FloatVert),
G_STRUCT_OFFSET (FloatVert, r),
4, /* n_components */
COGL_ATTRIBUTE_TYPE_FLOAT);
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_push_matrix (test_fb);
cogl_framebuffer_translate (test_fb, offset_x, offset_y, 0.0f);
Add a conformance test for custom attributes The test creates some pipelines with snippets with custom attributes and uses CoglAttribute to define values for them. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2011-12-02 05:55:41 -05:00
framebuffer: remove attribute drawing apis Almost nothing draws attributes directly and for those things that do it's trivial to adapt them to instead draw via the cogl_primitive api. This simplifies the Cogl api a bit. Reviewed-by: Neil Roberts <neil@linux.intel.com> (cherry picked from commit 7395925bcc01aad6c695fd0d9af78b784b3c64d4) Conflicts: cogl/cogl-framebuffer.c cogl/cogl-framebuffer.h
2013-07-09 19:39:18 -04:00
primitive = cogl_primitive_new_with_attributes (COGL_VERTICES_MODE_TRIANGLES,
6, /* n_vertices */
attributes,
2); /* n_attributes */
cogl_primitive_draw (primitive, test_fb, state->pipeline);
cogl_object_unref (primitive);
Add a conformance test for custom attributes The test creates some pipelines with snippets with custom attributes and uses CoglAttribute to define values for them. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2011-12-02 05:55:41 -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_pop_matrix (test_fb);
Add a conformance test for custom attributes The test creates some pipelines with snippets with custom attributes and uses CoglAttribute to define values for them. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2011-12-02 05:55:41 -05:00
cogl_object_unref (attributes[1]);
cogl_object_unref (attributes[0]);
cogl_object_unref (buffer);
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, offset_x + 5, offset_y + 5, 0xff0000ff);
test_utils_check_pixel (test_fb, offset_x + 15, offset_y + 5, 0x00ff00ff);
Add a conformance test for custom attributes The test creates some pipelines with snippets with custom attributes and uses CoglAttribute to define values for them. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2011-12-02 05:55:41 -05:00
}
static void
test_byte_verts (TestState *state, int offset_x, int offset_y)
{
CoglAttribute *attributes[2];
CoglAttributeBuffer *buffer, *unnorm_buffer;
framebuffer: remove attribute drawing apis Almost nothing draws attributes directly and for those things that do it's trivial to adapt them to instead draw via the cogl_primitive api. This simplifies the Cogl api a bit. Reviewed-by: Neil Roberts <neil@linux.intel.com> (cherry picked from commit 7395925bcc01aad6c695fd0d9af78b784b3c64d4) Conflicts: cogl/cogl-framebuffer.c cogl/cogl-framebuffer.h
2013-07-09 19:39:18 -04:00
CoglPrimitive *primitive;
Add a conformance test for custom attributes The test creates some pipelines with snippets with custom attributes and uses CoglAttribute to define values for them. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2011-12-02 05:55:41 -05:00
static const ByteVert norm_verts[] =
{
{ 0, 10, /**/ 255, 0, 0, 255 },
{ 10, 10, /**/ 255, 0, 0, 255 },
{ 5, 0, /**/ 255, 0, 0, 255 },
{ 10, 10, /**/ 0, 255, 0, 255 },
{ 20, 10, /**/ 0, 255, 0, 255 },
{ 15, 0, /**/ 0, 255, 0, 255 }
};
static const ByteVert unnorm_verts[] =
{
{ 0, 0, /**/ 0, 0, 1, 1 },
{ 0, 0, /**/ 0, 0, 1, 1 },
{ 0, 0, /**/ 0, 0, 1, 1 },
};
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
buffer = cogl_attribute_buffer_new (test_ctx,
buffer: explicitly relate buffers to a context All CoglBuffer constructors now take an explicit CoglContext constructor. This is part of the on going effort to adapt to Cogl API so it no longer depends on a global, default context. Reviewed-by: Neil Roberts <neil@linux.intel.com>
2012-02-06 12:08:58 -05:00
sizeof (norm_verts), norm_verts);
Add a conformance test for custom attributes The test creates some pipelines with snippets with custom attributes and uses CoglAttribute to define values for them. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2011-12-02 05:55:41 -05:00
attributes[0] = cogl_attribute_new (buffer,
"cogl_position_in",
sizeof (ByteVert),
G_STRUCT_OFFSET (ByteVert, x),
2, /* n_components */
COGL_ATTRIBUTE_TYPE_SHORT);
attributes[1] = cogl_attribute_new (buffer,
"color",
sizeof (ByteVert),
G_STRUCT_OFFSET (ByteVert, r),
4, /* n_components */
COGL_ATTRIBUTE_TYPE_UNSIGNED_BYTE);
cogl_attribute_set_normalized (attributes[1], TRUE);
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_push_matrix (test_fb);
cogl_framebuffer_translate (test_fb, offset_x, offset_y, 0.0f);
Add a conformance test for custom attributes The test creates some pipelines with snippets with custom attributes and uses CoglAttribute to define values for them. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2011-12-02 05:55:41 -05:00
framebuffer: remove attribute drawing apis Almost nothing draws attributes directly and for those things that do it's trivial to adapt them to instead draw via the cogl_primitive api. This simplifies the Cogl api a bit. Reviewed-by: Neil Roberts <neil@linux.intel.com> (cherry picked from commit 7395925bcc01aad6c695fd0d9af78b784b3c64d4) Conflicts: cogl/cogl-framebuffer.c cogl/cogl-framebuffer.h
2013-07-09 19:39:18 -04:00
primitive = cogl_primitive_new_with_attributes (COGL_VERTICES_MODE_TRIANGLES,
6, /* n_vertices */
attributes,
2); /* n_attributes */
cogl_primitive_draw (primitive, test_fb, state->pipeline);
cogl_object_unref (primitive);
Add a conformance test for custom attributes The test creates some pipelines with snippets with custom attributes and uses CoglAttribute to define values for them. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2011-12-02 05:55:41 -05:00
cogl_object_unref (attributes[1]);
/* Test again with unnormalized attributes */
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
unnorm_buffer = cogl_attribute_buffer_new (test_ctx,
buffer: explicitly relate buffers to a context All CoglBuffer constructors now take an explicit CoglContext constructor. This is part of the on going effort to adapt to Cogl API so it no longer depends on a global, default context. Reviewed-by: Neil Roberts <neil@linux.intel.com>
2012-02-06 12:08:58 -05:00
sizeof (unnorm_verts),
Add a conformance test for custom attributes The test creates some pipelines with snippets with custom attributes and uses CoglAttribute to define values for them. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2011-12-02 05:55:41 -05:00
unnorm_verts);
attributes[1] = cogl_attribute_new (unnorm_buffer,
"color",
sizeof (ByteVert),
G_STRUCT_OFFSET (ByteVert, r),
4, /* n_components */
COGL_ATTRIBUTE_TYPE_BYTE);
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_translate (test_fb, 20, 0, 0);
Add a conformance test for custom attributes The test creates some pipelines with snippets with custom attributes and uses CoglAttribute to define values for them. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2011-12-02 05:55:41 -05:00
framebuffer: remove attribute drawing apis Almost nothing draws attributes directly and for those things that do it's trivial to adapt them to instead draw via the cogl_primitive api. This simplifies the Cogl api a bit. Reviewed-by: Neil Roberts <neil@linux.intel.com> (cherry picked from commit 7395925bcc01aad6c695fd0d9af78b784b3c64d4) Conflicts: cogl/cogl-framebuffer.c cogl/cogl-framebuffer.h
2013-07-09 19:39:18 -04:00
primitive = cogl_primitive_new_with_attributes (COGL_VERTICES_MODE_TRIANGLES,
3, /* n_vertices */
attributes,
2); /* n_attributes */
cogl_primitive_draw (primitive, test_fb, state->pipeline);
cogl_object_unref (primitive);
Add a conformance test for custom attributes The test creates some pipelines with snippets with custom attributes and uses CoglAttribute to define values for them. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2011-12-02 05:55:41 -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_pop_matrix (test_fb);
Add a conformance test for custom attributes The test creates some pipelines with snippets with custom attributes and uses CoglAttribute to define values for them. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2011-12-02 05:55:41 -05:00
cogl_object_unref (attributes[0]);
cogl_object_unref (attributes[1]);
cogl_object_unref (buffer);
cogl_object_unref (unnorm_buffer);
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, offset_x + 5, offset_y + 5, 0xff0000ff);
test_utils_check_pixel (test_fb, offset_x + 15, offset_y + 5, 0x00ff00ff);
test_utils_check_pixel (test_fb, offset_x + 25, offset_y + 5, 0x0000ffff);
Add a conformance test for custom attributes The test creates some pipelines with snippets with custom attributes and uses CoglAttribute to define values for them. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2011-12-02 05:55:41 -05:00
}
static void
test_short_verts (TestState *state, int offset_x, int offset_y)
{
gl: bind position attribute to location 0 Full GL treats the position attribute specially and requires that it must be bound to generic attribute location 0 unlike GLES 2.0 or GL 3.2 core. We now make sure to unconditionally bind the cogl_position_in attribute to location 0 before linking any glsl program in cogl. For reference the relevant part of the GL 3.0 spec that covers these semantics is Section 2.7 "Vertex Specification" pg 27 After this change there was one remaining problem in test-custom-attributes where the test_short_verts() test was using its own "pos" attribute instead of cogl_position_in and so cogl wasn't able to ensure it would be bound to location 0. This updates the test to use cogl_position_in but to work around the fact that glVertexPointer doesn't support UNSIGNED_SHORT components we force the test to use the glsl backend by setting a shader snippet on the pipeline. https://bugs.freedesktop.org/show_bug.cgi?id=67548 Reviewed-by: Neil Roberts <neil@linux.intel.com> (cherry picked from commit 992ef7b3b49ebb56adde2133bb36330c04133a3f)
2013-08-16 16:23:37 -04:00
CoglAttribute *attributes[2];
Add a conformance test for custom attributes The test creates some pipelines with snippets with custom attributes and uses CoglAttribute to define values for them. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2011-12-02 05:55:41 -05:00
CoglAttributeBuffer *buffer;
CoglPipeline *pipeline, *pipeline2;
CoglSnippet *snippet;
framebuffer: remove attribute drawing apis Almost nothing draws attributes directly and for those things that do it's trivial to adapt them to instead draw via the cogl_primitive api. This simplifies the Cogl api a bit. Reviewed-by: Neil Roberts <neil@linux.intel.com> (cherry picked from commit 7395925bcc01aad6c695fd0d9af78b784b3c64d4) Conflicts: cogl/cogl-framebuffer.c cogl/cogl-framebuffer.h
2013-07-09 19:39:18 -04:00
CoglPrimitive *primitive;
Add a conformance test for custom attributes The test creates some pipelines with snippets with custom attributes and uses CoglAttribute to define values for them. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2011-12-02 05:55:41 -05:00
static const ShortVert short_verts[] =
{
gl: bind position attribute to location 0 Full GL treats the position attribute specially and requires that it must be bound to generic attribute location 0 unlike GLES 2.0 or GL 3.2 core. We now make sure to unconditionally bind the cogl_position_in attribute to location 0 before linking any glsl program in cogl. For reference the relevant part of the GL 3.0 spec that covers these semantics is Section 2.7 "Vertex Specification" pg 27 After this change there was one remaining problem in test-custom-attributes where the test_short_verts() test was using its own "pos" attribute instead of cogl_position_in and so cogl wasn't able to ensure it would be bound to location 0. This updates the test to use cogl_position_in but to work around the fact that glVertexPointer doesn't support UNSIGNED_SHORT components we force the test to use the glsl backend by setting a shader snippet on the pipeline. https://bugs.freedesktop.org/show_bug.cgi?id=67548 Reviewed-by: Neil Roberts <neil@linux.intel.com> (cherry picked from commit 992ef7b3b49ebb56adde2133bb36330c04133a3f)
2013-08-16 16:23:37 -04:00
{ -10, -10, /**/ 0xffff, 0, 0, 0xffff },
{ -1, -10, /**/ 0xffff, 0, 0, 0xffff },
{ -5, -1, /**/ 0xffff, 0, 0, 0xffff }
Add a conformance test for custom attributes The test creates some pipelines with snippets with custom attributes and uses CoglAttribute to define values for them. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2011-12-02 05:55:41 -05:00
};
gl: bind position attribute to location 0 Full GL treats the position attribute specially and requires that it must be bound to generic attribute location 0 unlike GLES 2.0 or GL 3.2 core. We now make sure to unconditionally bind the cogl_position_in attribute to location 0 before linking any glsl program in cogl. For reference the relevant part of the GL 3.0 spec that covers these semantics is Section 2.7 "Vertex Specification" pg 27 After this change there was one remaining problem in test-custom-attributes where the test_short_verts() test was using its own "pos" attribute instead of cogl_position_in and so cogl wasn't able to ensure it would be bound to location 0. This updates the test to use cogl_position_in but to work around the fact that glVertexPointer doesn't support UNSIGNED_SHORT components we force the test to use the glsl backend by setting a shader snippet on the pipeline. https://bugs.freedesktop.org/show_bug.cgi?id=67548 Reviewed-by: Neil Roberts <neil@linux.intel.com> (cherry picked from commit 992ef7b3b49ebb56adde2133bb36330c04133a3f)
2013-08-16 16:23:37 -04:00
pipeline = cogl_pipeline_copy (state->pipeline);
Add a conformance test for custom attributes The test creates some pipelines with snippets with custom attributes and uses CoglAttribute to define values for them. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2011-12-02 05:55:41 -05:00
cogl_pipeline_set_color4ub (pipeline, 255, 0, 0, 255);
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
buffer = cogl_attribute_buffer_new (test_ctx,
buffer: explicitly relate buffers to a context All CoglBuffer constructors now take an explicit CoglContext constructor. This is part of the on going effort to adapt to Cogl API so it no longer depends on a global, default context. Reviewed-by: Neil Roberts <neil@linux.intel.com>
2012-02-06 12:08:58 -05:00
sizeof (short_verts), short_verts);
Add a conformance test for custom attributes The test creates some pipelines with snippets with custom attributes and uses CoglAttribute to define values for them. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2011-12-02 05:55:41 -05:00
attributes[0] = cogl_attribute_new (buffer,
gl: bind position attribute to location 0 Full GL treats the position attribute specially and requires that it must be bound to generic attribute location 0 unlike GLES 2.0 or GL 3.2 core. We now make sure to unconditionally bind the cogl_position_in attribute to location 0 before linking any glsl program in cogl. For reference the relevant part of the GL 3.0 spec that covers these semantics is Section 2.7 "Vertex Specification" pg 27 After this change there was one remaining problem in test-custom-attributes where the test_short_verts() test was using its own "pos" attribute instead of cogl_position_in and so cogl wasn't able to ensure it would be bound to location 0. This updates the test to use cogl_position_in but to work around the fact that glVertexPointer doesn't support UNSIGNED_SHORT components we force the test to use the glsl backend by setting a shader snippet on the pipeline. https://bugs.freedesktop.org/show_bug.cgi?id=67548 Reviewed-by: Neil Roberts <neil@linux.intel.com> (cherry picked from commit 992ef7b3b49ebb56adde2133bb36330c04133a3f)
2013-08-16 16:23:37 -04:00
"cogl_position_in",
Add a conformance test for custom attributes The test creates some pipelines with snippets with custom attributes and uses CoglAttribute to define values for them. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2011-12-02 05:55:41 -05:00
sizeof (ShortVert),
G_STRUCT_OFFSET (ShortVert, x),
2, /* n_components */
COGL_ATTRIBUTE_TYPE_SHORT);
gl: bind position attribute to location 0 Full GL treats the position attribute specially and requires that it must be bound to generic attribute location 0 unlike GLES 2.0 or GL 3.2 core. We now make sure to unconditionally bind the cogl_position_in attribute to location 0 before linking any glsl program in cogl. For reference the relevant part of the GL 3.0 spec that covers these semantics is Section 2.7 "Vertex Specification" pg 27 After this change there was one remaining problem in test-custom-attributes where the test_short_verts() test was using its own "pos" attribute instead of cogl_position_in and so cogl wasn't able to ensure it would be bound to location 0. This updates the test to use cogl_position_in but to work around the fact that glVertexPointer doesn't support UNSIGNED_SHORT components we force the test to use the glsl backend by setting a shader snippet on the pipeline. https://bugs.freedesktop.org/show_bug.cgi?id=67548 Reviewed-by: Neil Roberts <neil@linux.intel.com> (cherry picked from commit 992ef7b3b49ebb56adde2133bb36330c04133a3f)
2013-08-16 16:23:37 -04:00
attributes[1] = cogl_attribute_new (buffer,
"color",
sizeof (ShortVert),
G_STRUCT_OFFSET (ShortVert, r),
4, /* n_components */
COGL_ATTRIBUTE_TYPE_UNSIGNED_SHORT);
cogl_attribute_set_normalized (attributes[1], TRUE);
Add a conformance test for custom attributes The test creates some pipelines with snippets with custom attributes and uses CoglAttribute to define values for them. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2011-12-02 05:55:41 -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_push_matrix (test_fb);
cogl_framebuffer_translate (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
offset_x + 10.0f,
offset_y + 10.0f,
0.0f);
Add a conformance test for custom attributes The test creates some pipelines with snippets with custom attributes and uses CoglAttribute to define values for them. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2011-12-02 05:55:41 -05:00
framebuffer: remove attribute drawing apis Almost nothing draws attributes directly and for those things that do it's trivial to adapt them to instead draw via the cogl_primitive api. This simplifies the Cogl api a bit. Reviewed-by: Neil Roberts <neil@linux.intel.com> (cherry picked from commit 7395925bcc01aad6c695fd0d9af78b784b3c64d4) Conflicts: cogl/cogl-framebuffer.c cogl/cogl-framebuffer.h
2013-07-09 19:39:18 -04:00
primitive = cogl_primitive_new_with_attributes (COGL_VERTICES_MODE_TRIANGLES,
3, /* n_vertices */
attributes,
gl: bind position attribute to location 0 Full GL treats the position attribute specially and requires that it must be bound to generic attribute location 0 unlike GLES 2.0 or GL 3.2 core. We now make sure to unconditionally bind the cogl_position_in attribute to location 0 before linking any glsl program in cogl. For reference the relevant part of the GL 3.0 spec that covers these semantics is Section 2.7 "Vertex Specification" pg 27 After this change there was one remaining problem in test-custom-attributes where the test_short_verts() test was using its own "pos" attribute instead of cogl_position_in and so cogl wasn't able to ensure it would be bound to location 0. This updates the test to use cogl_position_in but to work around the fact that glVertexPointer doesn't support UNSIGNED_SHORT components we force the test to use the glsl backend by setting a shader snippet on the pipeline. https://bugs.freedesktop.org/show_bug.cgi?id=67548 Reviewed-by: Neil Roberts <neil@linux.intel.com> (cherry picked from commit 992ef7b3b49ebb56adde2133bb36330c04133a3f)
2013-08-16 16:23:37 -04:00
2); /* n_attributes */
framebuffer: remove attribute drawing apis Almost nothing draws attributes directly and for those things that do it's trivial to adapt them to instead draw via the cogl_primitive api. This simplifies the Cogl api a bit. Reviewed-by: Neil Roberts <neil@linux.intel.com> (cherry picked from commit 7395925bcc01aad6c695fd0d9af78b784b3c64d4) Conflicts: cogl/cogl-framebuffer.c cogl/cogl-framebuffer.h
2013-07-09 19:39:18 -04:00
cogl_primitive_draw (primitive, test_fb, pipeline);
cogl_object_unref (primitive);
Add a conformance test for custom attributes The test creates some pipelines with snippets with custom attributes and uses CoglAttribute to define values for them. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2011-12-02 05:55:41 -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_pop_matrix (test_fb);
Add a conformance test for custom attributes The test creates some pipelines with snippets with custom attributes and uses CoglAttribute to define values for them. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2011-12-02 05:55:41 -05:00
cogl_object_unref (attributes[0]);
/* Test again treating the attribute as unsigned */
attributes[0] = cogl_attribute_new (buffer,
gl: bind position attribute to location 0 Full GL treats the position attribute specially and requires that it must be bound to generic attribute location 0 unlike GLES 2.0 or GL 3.2 core. We now make sure to unconditionally bind the cogl_position_in attribute to location 0 before linking any glsl program in cogl. For reference the relevant part of the GL 3.0 spec that covers these semantics is Section 2.7 "Vertex Specification" pg 27 After this change there was one remaining problem in test-custom-attributes where the test_short_verts() test was using its own "pos" attribute instead of cogl_position_in and so cogl wasn't able to ensure it would be bound to location 0. This updates the test to use cogl_position_in but to work around the fact that glVertexPointer doesn't support UNSIGNED_SHORT components we force the test to use the glsl backend by setting a shader snippet on the pipeline. https://bugs.freedesktop.org/show_bug.cgi?id=67548 Reviewed-by: Neil Roberts <neil@linux.intel.com> (cherry picked from commit 992ef7b3b49ebb56adde2133bb36330c04133a3f)
2013-08-16 16:23:37 -04:00
"cogl_position_in",
Add a conformance test for custom attributes The test creates some pipelines with snippets with custom attributes and uses CoglAttribute to define values for them. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2011-12-02 05:55:41 -05:00
sizeof (ShortVert),
G_STRUCT_OFFSET (ShortVert, x),
2, /* n_components */
COGL_ATTRIBUTE_TYPE_UNSIGNED_SHORT);
gl: bind position attribute to location 0 Full GL treats the position attribute specially and requires that it must be bound to generic attribute location 0 unlike GLES 2.0 or GL 3.2 core. We now make sure to unconditionally bind the cogl_position_in attribute to location 0 before linking any glsl program in cogl. For reference the relevant part of the GL 3.0 spec that covers these semantics is Section 2.7 "Vertex Specification" pg 27 After this change there was one remaining problem in test-custom-attributes where the test_short_verts() test was using its own "pos" attribute instead of cogl_position_in and so cogl wasn't able to ensure it would be bound to location 0. This updates the test to use cogl_position_in but to work around the fact that glVertexPointer doesn't support UNSIGNED_SHORT components we force the test to use the glsl backend by setting a shader snippet on the pipeline. https://bugs.freedesktop.org/show_bug.cgi?id=67548 Reviewed-by: Neil Roberts <neil@linux.intel.com> (cherry picked from commit 992ef7b3b49ebb56adde2133bb36330c04133a3f)
2013-08-16 16:23:37 -04:00
/* XXX: this is a hack to force the pipeline to use the glsl backend
* because we know it's not possible to test short vertex position
* components with the legacy GL backend since which might otherwise
* be used internally... */
pipeline2 = cogl_pipeline_new (test_ctx);
snippet = cogl_snippet_new (COGL_SNIPPET_HOOK_VERTEX,
"attribute vec4 color;",
"cogl_color_out = vec4 (0.0, 1.0, 0.0, 1.0);");
cogl_pipeline_add_snippet (pipeline2, snippet);
Add a conformance test for custom attributes The test creates some pipelines with snippets with custom attributes and uses CoglAttribute to define values for them. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2011-12-02 05:55:41 -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_push_matrix (test_fb);
cogl_framebuffer_translate (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
offset_x + 10.0f - 65525.0f,
offset_y - 65525,
0.0f);
Add a conformance test for custom attributes The test creates some pipelines with snippets with custom attributes and uses CoglAttribute to define values for them. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2011-12-02 05:55:41 -05:00
framebuffer: remove attribute drawing apis Almost nothing draws attributes directly and for those things that do it's trivial to adapt them to instead draw via the cogl_primitive api. This simplifies the Cogl api a bit. Reviewed-by: Neil Roberts <neil@linux.intel.com> (cherry picked from commit 7395925bcc01aad6c695fd0d9af78b784b3c64d4) Conflicts: cogl/cogl-framebuffer.c cogl/cogl-framebuffer.h
2013-07-09 19:39:18 -04:00
primitive = cogl_primitive_new_with_attributes (COGL_VERTICES_MODE_TRIANGLES,
3, /* n_vertices */
attributes,
1); /* n_attributes */
cogl_primitive_draw (primitive, test_fb, pipeline2);
cogl_object_unref (primitive);
Add a conformance test for custom attributes The test creates some pipelines with snippets with custom attributes and uses CoglAttribute to define values for them. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2011-12-02 05:55:41 -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_pop_matrix (test_fb);
Add a conformance test for custom attributes The test creates some pipelines with snippets with custom attributes and uses CoglAttribute to define values for them. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2011-12-02 05:55:41 -05:00
cogl_object_unref (attributes[0]);
cogl_object_unref (pipeline2);
cogl_object_unref (pipeline);
cogl_object_unref (buffer);
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, offset_x + 5, offset_y + 5, 0xff0000ff);
test_utils_check_pixel (test_fb, offset_x + 15, offset_y + 5, 0x00ff00ff);
Add a conformance test for custom attributes The test creates some pipelines with snippets with custom attributes and uses CoglAttribute to define values for them. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2011-12-02 05:55:41 -05:00
}
static void
paint (TestState *state)
{
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, COGL_BUFFER_BIT_COLOR, 0, 0, 0, 1);
Add a conformance test for custom attributes The test creates some pipelines with snippets with custom attributes and uses CoglAttribute to define values for them. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2011-12-02 05:55:41 -05:00
test_float_verts (state, 0, 0);
test_byte_verts (state, 0, 10);
test_short_verts (state, 0, 20);
}
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_custom_attributes (void)
Add a conformance test for custom attributes The test creates some pipelines with snippets with custom attributes and uses CoglAttribute to define values for them. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2011-12-02 05:55:41 -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
CoglSnippet *snippet;
TestState state;
cogl_framebuffer_orthographic (test_fb,
0, 0,
cogl_framebuffer_get_width (test_fb),
cogl_framebuffer_get_height (test_fb),
-1,
100);
state.pipeline = cogl_pipeline_new (test_ctx);
snippet = cogl_snippet_new (COGL_SNIPPET_HOOK_VERTEX,
"attribute vec4 color;",
"cogl_color_out = color;");
cogl_pipeline_add_snippet (state.pipeline, snippet);
paint (&state);
cogl_object_unref (state.pipeline);
cogl_object_unref (snippet);
if (cogl_test_verbose ())
g_print ("OK\n");
Add a conformance test for custom attributes The test creates some pipelines with snippets with custom attributes and uses CoglAttribute to define values for them. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2011-12-02 05:55:41 -05:00
}
Reference in New Issue Copy Permalink