isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-24 09:00:42 -05:00
Code Issues Packages Projects Releases Wiki Activity
gbsneto/content-pt1
mutter/cogl/tests/conform/test-point-sprite.c

196 lines
6.4 KiB
C
Raw Permalink Normal View History

Remove cogl-1.0 vs cogl-2.0 vs cogl experimental API split Mutter (and libmutter users) are the only users of this version of cogl, and will more or less only use the cogl-1.0, cogl-2.0 and cogl experimental API variants, and having the possibility of having different API versions of the same API depending on what file includes it is error prone and confusing. Lets just remove the possibility of having different versions of the same API. https://bugzilla.gnome.org/show_bug.cgi?id=768977
2016-06-16 15:04:40 -04:00
#include <cogl/cogl.h>
Add a conformance test for point sprites This adds a conformance test which renders a texture point using a 2x2 texture with a different color for each texel. It then verifies that each texel is mapped to the correct position on the point. The test is currently failing. The test requires the point sprite feature flag so this patch also adds a TEST_REQUIREMENT_* flag for that. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2012-03-06 18:36:45 -05:00
cogl: Add missing function declarations In plenty of places a non-static function was defined but didn't have the corresponding declaration. Fix this by adding them, or alternatively making them static.
2019-01-20 05:41:48 -05:00
#include "test-declarations.h"
Add a conformance test for point sprites This adds a conformance test which renders a texture point using a 2x2 texture with a different color for each texel. It then verifies that each texel is mapped to the correct position on the point. The test is currently failing. The test requires the point sprite feature flag so this patch also adds a TEST_REQUIREMENT_* flag for that. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2012-03-06 18:36:45 -05:00
#include "test-utils.h"
#define POINT_SIZE 8
static const CoglVertexP2T2
point =
{
POINT_SIZE, POINT_SIZE,
0.0f, 0.0f
};
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
Add a conformance test for point sprites This adds a conformance test which renders a texture point using a 2x2 texture with a different color for each texel. It then verifies that each texel is mapped to the correct position on the point. The test is currently failing. The test requires the point sprite feature flag so this patch also adds a TEST_REQUIREMENT_* flag for that. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2012-03-06 18:36:45 -05:00
tex_data[3 * 2 * 2] =
{
0x00, 0x00, 0xff, 0x00, 0xff, 0x00,
0x00, 0xff, 0xff, 0xff, 0x00, 0x00
};
Split test-point-sprite into two, one without checking orientation There is currently a known bug where when rendering offscreen point sprites will be rendered upside-down. For that reason test-point-sprite is marked as a known failure because it checks the orientation of the point sprites and the conformance test suite is rendered to offscreen buffers by default. However this doesn't help to catch more general failures that stop the point sprites being rendered at all. To fix this the test-point-sprite test has been split into two tests, one which verifies the orientation and one which does not. The two tests are in the same source file and internally share the same static function but pass a flag to specify whether to check the orientation. If the orientation should be ignored then it will create a 2x1 texture instead of a 2x2 texture so that it will appear the same regardless of whether it is upside-down. The checks for the colors have been altered accordingly. Reviewed-by: Robert Bragg <robert@linux.intel.com> (cherry picked from commit 51b7fdbe17f300cf2edf42c2ca740ad748c9fd78)
2012-07-02 09:50:54 -04:00
static void
Add a conformance test for using cogl_point_coord in a shader This adds a modification to the test-point-sprite test which uses a shader snippet which directly references cogl_point_coord instead of relying on cogl_pipeline_set_layer_point_sprite_coords_enabled to replace the texture coordinates with the point coords. Reviewed-by: Robert Bragg <robert@linux.intel.com> (cherry picked from commit 5ea57b14f5ec7d52ae378f4ca64574ef56342f56)
2013-08-29 09:14:35 -04:00
do_test (CoglBool check_orientation,
CoglBool use_glsl)
Add a conformance test for point sprites This adds a conformance test which renders a texture point using a 2x2 texture with a different color for each texel. It then verifies that each texel is mapped to the correct position on the point. The test is currently failing. The test requires the point sprite feature flag so this patch also adds a TEST_REQUIREMENT_* flag for that. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2012-03-06 18:36:45 -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
int fb_width = cogl_framebuffer_get_width (test_fb);
int fb_height = cogl_framebuffer_get_height (test_fb);
Add a conformance test for point sprites This adds a conformance test which renders a texture point using a 2x2 texture with a different color for each texel. It then verifies that each texel is mapped to the correct position on the point. The test is currently failing. The test requires the point sprite feature flag so this patch also adds a TEST_REQUIREMENT_* flag for that. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2012-03-06 18:36:45 -05:00
CoglPrimitive *prim;
Adds CoglError api Although we use GLib internally in Cogl we would rather not leak GLib api through Cogl's own api, except through explicitly namespaced cogl_glib_ / cogl_gtype_ feature apis. One of the benefits we see to not leaking GLib through Cogl's public API is that documentation for Cogl won't need to first introduce the Glib API to newcomers, thus hopefully lowering the barrier to learning Cogl. This patch provides a Cogl specific typedef for reporting runtime errors which by no coincidence matches the typedef for GError exactly. If Cogl is built with --enable-glib (default) then developers can even safely assume that a CoglError is a GError under the hood. This patch also enforces a consistent policy for when NULL is passed as an error argument and an error is thrown. In this case we log the error and abort the application, instead of silently ignoring it. In common cases where nothing has been implemented to handle a particular error and/or where applications are just printing the error and aborting themselves then this saves some typing. This also seems more consistent with language based exceptions which usually cause a program to abort if they are not explicitly caught (which passing a non-NULL error signifies in this case) Since this policy for NULL error pointers is stricter than the standard GError convention, there is a clear note in the documentation to warn developers that are used to using the GError api. Reviewed-by: Neil Roberts <neil@linux.intel.com> (cherry picked from commit b068d5ea09ab32c37e8c965fc8582c85d1b2db46) Note: Since we can't change the Cogl 1.x api the patch was changed to not rename _error_quark() functions to be _error_domain() functions and although it's a bit ugly, instead of providing our own CoglError type that's compatible with GError we simply #define CoglError to GError unless Cogl is built with glib disabled. Note: this patch does technically introduce an API break since it drops the cogl_error_get_type() symbol generated by glib-mkenum (Since the CoglError enum was replaced by a CoglSystemError enum) but for now we are assuming that this will not affect anyone currently using the Cogl API. If this does turn out to be a problem in practice then we would be able to fix this my manually copying an implementation of cogl_error_get_type() generated by glib-mkenum into a compatibility source file and we could also define the original COGL_ERROR_ enums for compatibility too. Note: another minor concern with cherry-picking this patch to the 1.14 branch is that an api scanner would be lead to believe that some APIs have changed, and for example the gobject-introspection parser which understands the semantics of GError will not understand the semantics of CoglError. We expect most people that have tried to use gobject-introspection with Cogl already understand though that it is not well suited to generating bindings of the Cogl api anyway and we aren't aware or anyone depending on such bindings for apis involving GErrors. (GnomeShell only makes very-very minimal use of Cogl via the gjs bindings for the cogl_rectangle and cogl_color apis.) The main reason we have cherry-picked this patch to the 1.14 branch even given the above concerns is that without it it would become very awkward for us to cherry-pick other beneficial patches from master.
2012-08-31 14:28:27 -04:00
CoglError *error = NULL;
Add a conformance test for point sprites This adds a conformance test which renders a texture point using a 2x2 texture with a different color for each texel. It then verifies that each texel is mapped to the correct position on the point. The test is currently failing. The test requires the point sprite feature flag so this patch also adds a TEST_REQUIREMENT_* flag for that. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2012-03-06 18:36:45 -05:00
CoglTexture2D *tex_2d;
CoglPipeline *pipeline, *solid_pipeline;
Split test-point-sprite into two, one without checking orientation There is currently a known bug where when rendering offscreen point sprites will be rendered upside-down. For that reason test-point-sprite is marked as a known failure because it checks the orientation of the point sprites and the conformance test suite is rendered to offscreen buffers by default. However this doesn't help to catch more general failures that stop the point sprites being rendered at all. To fix this the test-point-sprite test has been split into two tests, one which verifies the orientation and one which does not. The two tests are in the same source file and internally share the same static function but pass a flag to specify whether to check the orientation. If the orientation should be ignored then it will create a 2x1 texture instead of a 2x2 texture so that it will appear the same regardless of whether it is upside-down. The checks for the colors have been altered accordingly. Reviewed-by: Robert Bragg <robert@linux.intel.com> (cherry picked from commit 51b7fdbe17f300cf2edf42c2ca740ad748c9fd78)
2012-07-02 09:50:54 -04:00
int tex_height;
Add a conformance test for point sprites This adds a conformance test which renders a texture point using a 2x2 texture with a different color for each texel. It then verifies that each texel is mapped to the correct position on the point. The test is currently failing. The test requires the point sprite feature flag so this patch also adds a TEST_REQUIREMENT_* flag for that. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2012-03-06 18:36:45 -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_orthographic (test_fb,
Add a conformance test for point sprites This adds a conformance test which renders a texture point using a 2x2 texture with a different color for each texel. It then verifies that each texel is mapped to the correct position on the point. The test is currently failing. The test requires the point sprite feature flag so this patch also adds a TEST_REQUIREMENT_* flag for that. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2012-03-06 18:36:45 -05:00
0, 0, /* x_1, y_1 */
fb_width, /* x_2 */
fb_height /* y_2 */,
-1, 100 /* near/far */);
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,
Add a conformance test for point sprites This adds a conformance test which renders a texture point using a 2x2 texture with a different color for each texel. It then verifies that each texel is mapped to the correct position on the point. The test is currently failing. The test requires the point sprite feature flag so this patch also adds a TEST_REQUIREMENT_* flag for that. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2012-03-06 18:36:45 -05:00
COGL_BUFFER_BIT_COLOR,
1.0f, 1.0f, 1.0f, 1.0f);
Split test-point-sprite into two, one without checking orientation There is currently a known bug where when rendering offscreen point sprites will be rendered upside-down. For that reason test-point-sprite is marked as a known failure because it checks the orientation of the point sprites and the conformance test suite is rendered to offscreen buffers by default. However this doesn't help to catch more general failures that stop the point sprites being rendered at all. To fix this the test-point-sprite test has been split into two tests, one which verifies the orientation and one which does not. The two tests are in the same source file and internally share the same static function but pass a flag to specify whether to check the orientation. If the orientation should be ignored then it will create a 2x1 texture instead of a 2x2 texture so that it will appear the same regardless of whether it is upside-down. The checks for the colors have been altered accordingly. Reviewed-by: Robert Bragg <robert@linux.intel.com> (cherry picked from commit 51b7fdbe17f300cf2edf42c2ca740ad748c9fd78)
2012-07-02 09:50:54 -04:00
/* If we're not checking the orientation of the point sprite then
* we'll set the height of the texture to 1 so that the vertical
* orientation does not matter */
if (check_orientation)
tex_height = 2;
else
tex_height = 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
tex_2d = cogl_texture_2d_new_from_data (test_ctx,
Split test-point-sprite into two, one without checking orientation There is currently a known bug where when rendering offscreen point sprites will be rendered upside-down. For that reason test-point-sprite is marked as a known failure because it checks the orientation of the point sprites and the conformance test suite is rendered to offscreen buffers by default. However this doesn't help to catch more general failures that stop the point sprites being rendered at all. To fix this the test-point-sprite test has been split into two tests, one which verifies the orientation and one which does not. The two tests are in the same source file and internally share the same static function but pass a flag to specify whether to check the orientation. If the orientation should be ignored then it will create a 2x1 texture instead of a 2x2 texture so that it will appear the same regardless of whether it is upside-down. The checks for the colors have been altered accordingly. Reviewed-by: Robert Bragg <robert@linux.intel.com> (cherry picked from commit 51b7fdbe17f300cf2edf42c2ca740ad748c9fd78)
2012-07-02 09:50:54 -04:00
2, tex_height, /* width/height */
Add a conformance test for point sprites This adds a conformance test which renders a texture point using a 2x2 texture with a different color for each texel. It then verifies that each texel is mapped to the correct position on the point. The test is currently failing. The test requires the point sprite feature flag so this patch also adds a TEST_REQUIREMENT_* flag for that. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2012-03-06 18:36:45 -05:00
COGL_PIXEL_FORMAT_RGB_888,
6, /* row stride */
tex_data,
&error);
g_assert (tex_2d != NULL);
g_assert (error == 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
pipeline = cogl_pipeline_new (test_ctx);
Declare interface types as void and remove cast macros This declares the interface types CoglFramebuffer, CoglBuffer, CoglTexture, CoglMetaTexture and CoglPrimitiveTexture as void when including the public cogl.h header so that users don't have to use lots of C type casts between instance types and interface types. This also removes all of the COGL_XYZ() type cast macros since they do nothing more than compile time type casting but it's less readable if you haven't seen that coding pattern before. Unlike with gobject based apis that use per-type macros for casting and performing runtime type checking we instead prefer to do our runtime type checking internally within the front-end public apis when objects are passed into Cogl. This greatly reduces the verbosity for users of the api and may help reduce the chance of excessive runtime type checking that can sometimes be a problem. (cherry picked from commit 248a76f5eac7e5ae4fb45208577f9a55360812a7) Since we can't break the 1.x api this version of the patch actually defines compatible NOP macros within deprecated/cogl-type-casts.h
2013-10-09 08:31:12 -04:00
cogl_pipeline_set_layer_texture (pipeline, 0, tex_2d);
Add a conformance test for point sprites This adds a conformance test which renders a texture point using a 2x2 texture with a different color for each texel. It then verifies that each texel is mapped to the correct position on the point. The test is currently failing. The test requires the point sprite feature flag so this patch also adds a TEST_REQUIREMENT_* flag for that. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2012-03-06 18:36:45 -05:00
Add a conformance test for using cogl_point_coord in a shader This adds a modification to the test-point-sprite test which uses a shader snippet which directly references cogl_point_coord instead of relying on cogl_pipeline_set_layer_point_sprite_coords_enabled to replace the texture coordinates with the point coords. Reviewed-by: Robert Bragg <robert@linux.intel.com> (cherry picked from commit 5ea57b14f5ec7d52ae378f4ca64574ef56342f56)
2013-08-29 09:14:35 -04:00
cogl_pipeline_set_layer_filters (pipeline,
0, /* layer_index */
COGL_PIPELINE_FILTER_NEAREST,
COGL_PIPELINE_FILTER_NEAREST);
cogl_pipeline_set_point_size (pipeline, POINT_SIZE);
/* If we're using GLSL then we don't need to enable point sprite
* coords and we can just directly reference cogl_point_coord in the
* snippet */
if (use_glsl)
{
CoglSnippet *snippet =
cogl_snippet_new (COGL_SNIPPET_HOOK_TEXTURE_LOOKUP,
NULL, /* declarations */
NULL /* post */);
static const char source[] =
" cogl_texel = texture2D (cogl_sampler, cogl_point_coord);\n";
cogl_snippet_set_replace (snippet, source);
/* Keep a reference to the original pipeline because there is no
* way to remove a snippet in order to recreate the solid
* pipeline */
solid_pipeline = cogl_pipeline_copy (pipeline);
cogl_pipeline_add_layer_snippet (pipeline, 0, snippet);
cogl_object_unref (snippet);
}
else
{
CoglBool res =
cogl_pipeline_set_layer_point_sprite_coords_enabled (pipeline,
Add a conformance test for point sprites This adds a conformance test which renders a texture point using a 2x2 texture with a different color for each texel. It then verifies that each texel is mapped to the correct position on the point. The test is currently failing. The test requires the point sprite feature flag so this patch also adds a TEST_REQUIREMENT_* flag for that. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2012-03-06 18:36:45 -05:00
/* layer_index */
0,
/* enable */
TRUE,
&error);
Add a conformance test for using cogl_point_coord in a shader This adds a modification to the test-point-sprite test which uses a shader snippet which directly references cogl_point_coord instead of relying on cogl_pipeline_set_layer_point_sprite_coords_enabled to replace the texture coordinates with the point coords. Reviewed-by: Robert Bragg <robert@linux.intel.com> (cherry picked from commit 5ea57b14f5ec7d52ae378f4ca64574ef56342f56)
2013-08-29 09:14:35 -04:00
g_assert (res == TRUE);
g_assert (error == NULL);
Add a conformance test for point sprites This adds a conformance test which renders a texture point using a 2x2 texture with a different color for each texel. It then verifies that each texel is mapped to the correct position on the point. The test is currently failing. The test requires the point sprite feature flag so this patch also adds a TEST_REQUIREMENT_* flag for that. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2012-03-06 18:36:45 -05:00
Add a conformance test for using cogl_point_coord in a shader This adds a modification to the test-point-sprite test which uses a shader snippet which directly references cogl_point_coord instead of relying on cogl_pipeline_set_layer_point_sprite_coords_enabled to replace the texture coordinates with the point coords. Reviewed-by: Robert Bragg <robert@linux.intel.com> (cherry picked from commit 5ea57b14f5ec7d52ae378f4ca64574ef56342f56)
2013-08-29 09:14:35 -04:00
solid_pipeline = cogl_pipeline_copy (pipeline);
res =
cogl_pipeline_set_layer_point_sprite_coords_enabled (solid_pipeline,
/* layer_index */
0,
/* enable */
FALSE,
&error);
g_assert (res == TRUE);
g_assert (error == NULL);
}
Add a conformance test for point sprites This adds a conformance test which renders a texture point using a 2x2 texture with a different color for each texel. It then verifies that each texel is mapped to the correct position on the point. The test is currently failing. The test requires the point sprite feature flag so this patch also adds a TEST_REQUIREMENT_* flag for that. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2012-03-06 18:36:45 -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
prim = cogl_primitive_new_p2t2 (test_ctx,
Add a conformance test for point sprites This adds a conformance test which renders a texture point using a 2x2 texture with a different color for each texel. It then verifies that each texel is mapped to the correct position on the point. The test is currently failing. The test requires the point sprite feature flag so this patch also adds a TEST_REQUIREMENT_* flag for that. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2012-03-06 18:36:45 -05:00
COGL_VERTICES_MODE_POINTS,
1, /* n_vertices */
&point);
Add _primitive_draw to replace _framebuffer_draw_primitive When splitting out the CoglPath api we saw that we would be left with inconsistent drawing apis if the drawing apis in core Cogl were lumped into the cogl_framebuffer_ api considering other Cogl sub-libraries or that others will want to create higher level drawing apis outside of Cogl but can't use the same namespace. So that we can aim for a more consistent style this adds a cogl_primitive_draw() api, comparable to cogl_path_fill() or cogl_pango_show_layout() that's intended to replace cogl_framebuffer_draw_primitive() Note: the attribute and rectangle drawing apis are still in the cogl_framebuffer_ namespace and this might potentially change but in these cases there is no single object representing the thing being drawn so it seems a more reasonable they they live in the framebuffer namespace for now. Note: the cogl_framebuffer_draw_primitive() api isn't removed by this patch so it can more conveniently be cherry picked to the 1.16 branch so we can mark it deprecated for a short while. Even though it's marked as experimental api we know that there are people using the api so we'd like to give them a chance to switch to the new api. Reviewed-by: Neil Roberts <neil@linux.intel.com> (cherry picked from commit 418912b93ff81a47f9b38114d05335ab76277c48) Conflicts: cogl-pango/cogl-pango-display-list.c cogl/Makefile.am cogl/cogl-framebuffer.c cogl/cogl-pipeline-layer-state.h cogl/cogl2-path.c cogl/driver/gl/cogl-clip-stack-gl.c
2013-07-09 18:47:29 -04:00
cogl_primitive_draw (prim, test_fb, pipeline);
Add a conformance test for point sprites This adds a conformance test which renders a texture point using a 2x2 texture with a different color for each texel. It then verifies that each texel is mapped to the correct position on the point. The test is currently failing. The test requires the point sprite feature flag so this patch also adds a TEST_REQUIREMENT_* flag for that. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2012-03-06 18:36:45 -05:00
/* Render the primitive again without point sprites to make sure
disabling it works */
Add a conformance test for using cogl_point_coord in a shader This adds a modification to the test-point-sprite test which uses a shader snippet which directly references cogl_point_coord instead of relying on cogl_pipeline_set_layer_point_sprite_coords_enabled to replace the texture coordinates with the point coords. Reviewed-by: Robert Bragg <robert@linux.intel.com> (cherry picked from commit 5ea57b14f5ec7d52ae378f4ca64574ef56342f56)
2013-08-29 09:14:35 -04: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,
Add a conformance test for point sprites This adds a conformance test which renders a texture point using a 2x2 texture with a different color for each texel. It then verifies that each texel is mapped to the correct position on the point. The test is currently failing. The test requires the point sprite feature flag so this patch also adds a TEST_REQUIREMENT_* flag for that. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2012-03-06 18:36:45 -05:00
POINT_SIZE * 2, /* x */
0.0f, /* y */
0.0f /* z */);
Add _primitive_draw to replace _framebuffer_draw_primitive When splitting out the CoglPath api we saw that we would be left with inconsistent drawing apis if the drawing apis in core Cogl were lumped into the cogl_framebuffer_ api considering other Cogl sub-libraries or that others will want to create higher level drawing apis outside of Cogl but can't use the same namespace. So that we can aim for a more consistent style this adds a cogl_primitive_draw() api, comparable to cogl_path_fill() or cogl_pango_show_layout() that's intended to replace cogl_framebuffer_draw_primitive() Note: the attribute and rectangle drawing apis are still in the cogl_framebuffer_ namespace and this might potentially change but in these cases there is no single object representing the thing being drawn so it seems a more reasonable they they live in the framebuffer namespace for now. Note: the cogl_framebuffer_draw_primitive() api isn't removed by this patch so it can more conveniently be cherry picked to the 1.16 branch so we can mark it deprecated for a short while. Even though it's marked as experimental api we know that there are people using the api so we'd like to give them a chance to switch to the new api. Reviewed-by: Neil Roberts <neil@linux.intel.com> (cherry picked from commit 418912b93ff81a47f9b38114d05335ab76277c48) Conflicts: cogl-pango/cogl-pango-display-list.c cogl/Makefile.am cogl/cogl-framebuffer.c cogl/cogl-pipeline-layer-state.h cogl/cogl2-path.c cogl/driver/gl/cogl-clip-stack-gl.c
2013-07-09 18:47:29 -04:00
cogl_primitive_draw (prim, test_fb, solid_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
cogl_framebuffer_pop_matrix (test_fb);
Add a conformance test for point sprites This adds a conformance test which renders a texture point using a 2x2 texture with a different color for each texel. It then verifies that each texel is mapped to the correct position on the point. The test is currently failing. The test requires the point sprite feature flag so this patch also adds a TEST_REQUIREMENT_* flag for that. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2012-03-06 18:36:45 -05:00
cogl_object_unref (prim);
cogl_object_unref (solid_pipeline);
cogl_object_unref (pipeline);
cogl_object_unref (tex_2d);
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,
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
POINT_SIZE - POINT_SIZE / 4,
Add a conformance test for point sprites This adds a conformance test which renders a texture point using a 2x2 texture with a different color for each texel. It then verifies that each texel is mapped to the correct position on the point. The test is currently failing. The test requires the point sprite feature flag so this patch also adds a TEST_REQUIREMENT_* flag for that. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2012-03-06 18:36:45 -05:00
POINT_SIZE - POINT_SIZE / 4,
0x0000ffff);
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,
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
POINT_SIZE + POINT_SIZE / 4,
Add a conformance test for point sprites This adds a conformance test which renders a texture point using a 2x2 texture with a different color for each texel. It then verifies that each texel is mapped to the correct position on the point. The test is currently failing. The test requires the point sprite feature flag so this patch also adds a TEST_REQUIREMENT_* flag for that. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2012-03-06 18:36:45 -05:00
POINT_SIZE - POINT_SIZE / 4,
0x00ff00ff);
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,
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
POINT_SIZE - POINT_SIZE / 4,
Add a conformance test for point sprites This adds a conformance test which renders a texture point using a 2x2 texture with a different color for each texel. It then verifies that each texel is mapped to the correct position on the point. The test is currently failing. The test requires the point sprite feature flag so this patch also adds a TEST_REQUIREMENT_* flag for that. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2012-03-06 18:36:45 -05:00
POINT_SIZE + POINT_SIZE / 4,
Split test-point-sprite into two, one without checking orientation There is currently a known bug where when rendering offscreen point sprites will be rendered upside-down. For that reason test-point-sprite is marked as a known failure because it checks the orientation of the point sprites and the conformance test suite is rendered to offscreen buffers by default. However this doesn't help to catch more general failures that stop the point sprites being rendered at all. To fix this the test-point-sprite test has been split into two tests, one which verifies the orientation and one which does not. The two tests are in the same source file and internally share the same static function but pass a flag to specify whether to check the orientation. If the orientation should be ignored then it will create a 2x1 texture instead of a 2x2 texture so that it will appear the same regardless of whether it is upside-down. The checks for the colors have been altered accordingly. Reviewed-by: Robert Bragg <robert@linux.intel.com> (cherry picked from commit 51b7fdbe17f300cf2edf42c2ca740ad748c9fd78)
2012-07-02 09:50:54 -04:00
check_orientation ?
0x00ffffff :
0x0000ffff);
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,
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
POINT_SIZE + POINT_SIZE / 4,
Add a conformance test for point sprites This adds a conformance test which renders a texture point using a 2x2 texture with a different color for each texel. It then verifies that each texel is mapped to the correct position on the point. The test is currently failing. The test requires the point sprite feature flag so this patch also adds a TEST_REQUIREMENT_* flag for that. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2012-03-06 18:36:45 -05:00
POINT_SIZE + POINT_SIZE / 4,
Split test-point-sprite into two, one without checking orientation There is currently a known bug where when rendering offscreen point sprites will be rendered upside-down. For that reason test-point-sprite is marked as a known failure because it checks the orientation of the point sprites and the conformance test suite is rendered to offscreen buffers by default. However this doesn't help to catch more general failures that stop the point sprites being rendered at all. To fix this the test-point-sprite test has been split into two tests, one which verifies the orientation and one which does not. The two tests are in the same source file and internally share the same static function but pass a flag to specify whether to check the orientation. If the orientation should be ignored then it will create a 2x1 texture instead of a 2x2 texture so that it will appear the same regardless of whether it is upside-down. The checks for the colors have been altered accordingly. Reviewed-by: Robert Bragg <robert@linux.intel.com> (cherry picked from commit 51b7fdbe17f300cf2edf42c2ca740ad748c9fd78)
2012-07-02 09:50:54 -04:00
check_orientation ?
0xff0000ff :
0x00ff00ff);
Add a conformance test for point sprites This adds a conformance test which renders a texture point using a 2x2 texture with a different color for each texel. It then verifies that each texel is mapped to the correct position on the point. The test is currently failing. The test requires the point sprite feature flag so this patch also adds a TEST_REQUIREMENT_* flag for that. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2012-03-06 18:36:45 -05:00
/* When rendering without the point sprites all of the texture
coordinates should be 0,0 so it should get the top-left texel
which is blue */
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_region (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
POINT_SIZE * 3 - POINT_SIZE / 2 + 1,
Add a conformance test for point sprites This adds a conformance test which renders a texture point using a 2x2 texture with a different color for each texel. It then verifies that each texel is mapped to the correct position on the point. The test is currently failing. The test requires the point sprite feature flag so this patch also adds a TEST_REQUIREMENT_* flag for that. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2012-03-06 18:36:45 -05:00
POINT_SIZE - POINT_SIZE / 2 + 1,
POINT_SIZE - 2, POINT_SIZE - 2,
0x0000ffff);
if (cogl_test_verbose ())
g_print ("OK\n");
}
Split test-point-sprite into two, one without checking orientation There is currently a known bug where when rendering offscreen point sprites will be rendered upside-down. For that reason test-point-sprite is marked as a known failure because it checks the orientation of the point sprites and the conformance test suite is rendered to offscreen buffers by default. However this doesn't help to catch more general failures that stop the point sprites being rendered at all. To fix this the test-point-sprite test has been split into two tests, one which verifies the orientation and one which does not. The two tests are in the same source file and internally share the same static function but pass a flag to specify whether to check the orientation. If the orientation should be ignored then it will create a 2x1 texture instead of a 2x2 texture so that it will appear the same regardless of whether it is upside-down. The checks for the colors have been altered accordingly. Reviewed-by: Robert Bragg <robert@linux.intel.com> (cherry picked from commit 51b7fdbe17f300cf2edf42c2ca740ad748c9fd78)
2012-07-02 09:50:54 -04:00
void
test_point_sprite (void)
{
Add a conformance test for using cogl_point_coord in a shader This adds a modification to the test-point-sprite test which uses a shader snippet which directly references cogl_point_coord instead of relying on cogl_pipeline_set_layer_point_sprite_coords_enabled to replace the texture coordinates with the point coords. Reviewed-by: Robert Bragg <robert@linux.intel.com> (cherry picked from commit 5ea57b14f5ec7d52ae378f4ca64574ef56342f56)
2013-08-29 09:14:35 -04:00
do_test (FALSE /* don't check orientation */,
FALSE /* don't use GLSL */);
Split test-point-sprite into two, one without checking orientation There is currently a known bug where when rendering offscreen point sprites will be rendered upside-down. For that reason test-point-sprite is marked as a known failure because it checks the orientation of the point sprites and the conformance test suite is rendered to offscreen buffers by default. However this doesn't help to catch more general failures that stop the point sprites being rendered at all. To fix this the test-point-sprite test has been split into two tests, one which verifies the orientation and one which does not. The two tests are in the same source file and internally share the same static function but pass a flag to specify whether to check the orientation. If the orientation should be ignored then it will create a 2x1 texture instead of a 2x2 texture so that it will appear the same regardless of whether it is upside-down. The checks for the colors have been altered accordingly. Reviewed-by: Robert Bragg <robert@linux.intel.com> (cherry picked from commit 51b7fdbe17f300cf2edf42c2ca740ad748c9fd78)
2012-07-02 09:50:54 -04:00
}
void
test_point_sprite_orientation (void)
{
Add a conformance test for using cogl_point_coord in a shader This adds a modification to the test-point-sprite test which uses a shader snippet which directly references cogl_point_coord instead of relying on cogl_pipeline_set_layer_point_sprite_coords_enabled to replace the texture coordinates with the point coords. Reviewed-by: Robert Bragg <robert@linux.intel.com> (cherry picked from commit 5ea57b14f5ec7d52ae378f4ca64574ef56342f56)
2013-08-29 09:14:35 -04:00
do_test (TRUE /* check orientation */,
FALSE /* don't use GLSL */);
}
void
test_point_sprite_glsl (void)
{
do_test (FALSE /* don't check orientation */,
TRUE /* use GLSL */);
Split test-point-sprite into two, one without checking orientation There is currently a known bug where when rendering offscreen point sprites will be rendered upside-down. For that reason test-point-sprite is marked as a known failure because it checks the orientation of the point sprites and the conformance test suite is rendered to offscreen buffers by default. However this doesn't help to catch more general failures that stop the point sprites being rendered at all. To fix this the test-point-sprite test has been split into two tests, one which verifies the orientation and one which does not. The two tests are in the same source file and internally share the same static function but pass a flag to specify whether to check the orientation. If the orientation should be ignored then it will create a 2x1 texture instead of a 2x2 texture so that it will appear the same regardless of whether it is upside-down. The checks for the colors have been altered accordingly. Reviewed-by: Robert Bragg <robert@linux.intel.com> (cherry picked from commit 51b7fdbe17f300cf2edf42c2ca740ad748c9fd78)
2012-07-02 09:50:54 -04:00
}
Reference in New Issue Copy Permalink