mirror of
https://github.com/brl/mutter.git
synced 2024-11-29 19:40:43 -05:00
7365c3aa77
This splits out the cogl_path_ api into a separate cogl-path sub-library like cogl-pango and cogl-gst. This enables developers to build Cogl with this sub-library disabled if they don't need it which can be useful when its important to keep the size of an application and its dependencies down to a minimum. The functions cogl_framebuffer_{fill,stroke}_path have been renamed to cogl_path_{fill,stroke}. There were a few places in core cogl and cogl-gst that referenced the CoglPath api and these have been decoupled by using the CoglPrimitive api instead. In the case of cogl_framebuffer_push_path_clip() the core clip stack no longer accepts path clips directly but it's now possible to get a CoglPrimitive for the fill of a path and so the implementation of cogl_framebuffer_push_path_clip() now lives in cogl-path and works as a shim that first gets a CoglPrimitive and uses cogl_framebuffer_push_primitive_clip instead. We may want to consider renaming cogl_framebuffer_push_path_clip to put it in the cogl_path_ namespace. Reviewed-by: Neil Roberts <neil@linux.intel.com> (cherry picked from commit 8aadfd829239534fb4ec8255cdea813d698c5a3f) So as to avoid breaking the 1.x API or even the ABI since we are quite late in the 1.16 development cycle the patch was modified to build cogl-path as a noinst_LTLIBRARY before building cogl and link the code directly into libcogl.so as it was previously. This way we can wait until the start of the 1.18 cycle before splitting the code into a separate libcogl-path.so. This also adds shims for cogl_framebuffer_fill/stroke_path() to avoid breaking the 1.x API/ABI.
216 lines
7.2 KiB
C
216 lines
7.2 KiB
C
#define COGL_ENABLE_EXPERIMENTAL_2_0_API
|
|
#include <cogl/cogl.h>
|
|
#include <cogl-path/cogl-path.h>
|
|
|
|
#include <string.h>
|
|
|
|
#include "test-utils.h"
|
|
|
|
#define BLOCK_SIZE 16
|
|
|
|
/* Number of pixels at the border of a block quadrant to skip when verifying */
|
|
#define TEST_INSET 1
|
|
|
|
typedef struct _TestState
|
|
{
|
|
int dummy;
|
|
} TestState;
|
|
|
|
static void
|
|
draw_path_at (CoglPath *path, CoglPipeline *pipeline, int x, int y)
|
|
{
|
|
cogl_framebuffer_push_matrix (test_fb);
|
|
cogl_framebuffer_translate (test_fb, x * BLOCK_SIZE, y * BLOCK_SIZE, 0.0f);
|
|
|
|
cogl_set_framebuffer (test_fb);
|
|
cogl_set_source (pipeline);
|
|
cogl_path_fill (path);
|
|
|
|
cogl_framebuffer_pop_matrix (test_fb);
|
|
}
|
|
|
|
static void
|
|
check_block (int block_x, int block_y, int block_mask)
|
|
{
|
|
uint32_t data[BLOCK_SIZE * BLOCK_SIZE];
|
|
int qx, qy;
|
|
|
|
/* Block mask represents which quarters of the block should be
|
|
filled. The bits from 0->3 represent the top left, top right,
|
|
bottom left and bottom right respectively */
|
|
|
|
cogl_framebuffer_read_pixels (test_fb,
|
|
block_x * BLOCK_SIZE,
|
|
block_y * BLOCK_SIZE,
|
|
BLOCK_SIZE, BLOCK_SIZE,
|
|
COGL_PIXEL_FORMAT_RGBA_8888_PRE,
|
|
(uint8_t *)data);
|
|
|
|
for (qy = 0; qy < 2; qy++)
|
|
for (qx = 0; qx < 2; qx++)
|
|
{
|
|
int bit = qx | (qy << 1);
|
|
const char *intended_pixel = ((block_mask & (1 << bit)) ? "#ffffff" : "#000000");
|
|
int x, y;
|
|
|
|
for (x = 0; x < BLOCK_SIZE / 2 - TEST_INSET * 2; x++)
|
|
for (y = 0; y < BLOCK_SIZE / 2 - TEST_INSET * 2; y++)
|
|
{
|
|
const uint32_t *p = data + (qx * BLOCK_SIZE / 2 +
|
|
qy * BLOCK_SIZE * BLOCK_SIZE / 2 +
|
|
(x + TEST_INSET) +
|
|
(y + TEST_INSET) * BLOCK_SIZE);
|
|
char *screen_pixel = g_strdup_printf ("#%06x", GUINT32_FROM_BE (*p) >> 8);
|
|
g_assert_cmpstr (screen_pixel, ==, intended_pixel);
|
|
g_free (screen_pixel);
|
|
}
|
|
}
|
|
}
|
|
|
|
static void
|
|
paint (TestState *state)
|
|
{
|
|
CoglPath *path_a, *path_b, *path_c;
|
|
CoglPipeline *white = cogl_pipeline_new (test_ctx);
|
|
|
|
cogl_pipeline_set_color4f (white, 1, 1, 1, 1);
|
|
|
|
/* Create a path filling just a quarter of a block. It will use two
|
|
rectangles so that we have a sub path in the path */
|
|
path_a = cogl_path_new ();
|
|
cogl_path_rectangle (path_a,
|
|
BLOCK_SIZE * 3 / 4, BLOCK_SIZE / 2,
|
|
BLOCK_SIZE, BLOCK_SIZE);
|
|
cogl_path_rectangle (path_a,
|
|
BLOCK_SIZE / 2, BLOCK_SIZE / 2,
|
|
BLOCK_SIZE * 3 / 4, BLOCK_SIZE);
|
|
draw_path_at (path_a, white, 0, 0);
|
|
|
|
/* Create another path filling the whole block */
|
|
path_b = cogl_path_new ();
|
|
cogl_path_rectangle (path_b, 0, 0, BLOCK_SIZE, BLOCK_SIZE);
|
|
draw_path_at (path_b, white, 1, 0);
|
|
|
|
/* Draw the first path again */
|
|
draw_path_at (path_a, white, 2, 0);
|
|
|
|
/* Draw a copy of path a */
|
|
path_c = cogl_path_copy (path_a);
|
|
draw_path_at (path_c, white, 3, 0);
|
|
|
|
/* Add another rectangle to path a. We'll use line_to's instead of
|
|
cogl_rectangle so that we don't create another sub-path because
|
|
that is more likely to break the copy */
|
|
cogl_path_line_to (path_a, 0, BLOCK_SIZE / 2);
|
|
cogl_path_line_to (path_a, 0, 0);
|
|
cogl_path_line_to (path_a, BLOCK_SIZE / 2, 0);
|
|
cogl_path_line_to (path_a, BLOCK_SIZE / 2, BLOCK_SIZE / 2);
|
|
draw_path_at (path_a, white, 4, 0);
|
|
|
|
/* Draw the copy again. It should not have changed */
|
|
draw_path_at (path_c, white, 5, 0);
|
|
|
|
/* Add another rectangle to path c. It will be added in two halves,
|
|
one as an extension of the previous path and the other as a new
|
|
sub path */
|
|
cogl_path_line_to (path_c, BLOCK_SIZE / 2, 0);
|
|
cogl_path_line_to (path_c, BLOCK_SIZE * 3 / 4, 0);
|
|
cogl_path_line_to (path_c, BLOCK_SIZE * 3 / 4, BLOCK_SIZE / 2);
|
|
cogl_path_line_to (path_c, BLOCK_SIZE / 2, BLOCK_SIZE / 2);
|
|
cogl_path_rectangle (path_c,
|
|
BLOCK_SIZE * 3 / 4, 0, BLOCK_SIZE, BLOCK_SIZE / 2);
|
|
draw_path_at (path_c, white, 6, 0);
|
|
|
|
/* Draw the original path again. It should not have changed */
|
|
draw_path_at (path_a, white, 7, 0);
|
|
|
|
cogl_object_unref (path_a);
|
|
cogl_object_unref (path_b);
|
|
cogl_object_unref (path_c);
|
|
|
|
/* Draw a self-intersecting path. The part that intersects should be
|
|
inverted */
|
|
path_a = cogl_path_new ();
|
|
cogl_path_rectangle (path_a, 0, 0, BLOCK_SIZE, BLOCK_SIZE);
|
|
cogl_path_line_to (path_a, 0, BLOCK_SIZE / 2);
|
|
cogl_path_line_to (path_a, BLOCK_SIZE / 2, BLOCK_SIZE / 2);
|
|
cogl_path_line_to (path_a, BLOCK_SIZE / 2, 0);
|
|
cogl_path_close (path_a);
|
|
draw_path_at (path_a, white, 8, 0);
|
|
cogl_object_unref (path_a);
|
|
|
|
/* Draw two sub paths. Where the paths intersect it should be
|
|
inverted */
|
|
path_a = cogl_path_new ();
|
|
cogl_path_rectangle (path_a, 0, 0, BLOCK_SIZE, BLOCK_SIZE);
|
|
cogl_path_rectangle (path_a,
|
|
BLOCK_SIZE / 2, BLOCK_SIZE / 2, BLOCK_SIZE, BLOCK_SIZE);
|
|
draw_path_at (path_a, white, 9, 0);
|
|
cogl_object_unref (path_a);
|
|
|
|
/* Draw a clockwise outer path */
|
|
path_a = cogl_path_new ();
|
|
cogl_path_move_to (path_a, 0, 0);
|
|
cogl_path_line_to (path_a, BLOCK_SIZE, 0);
|
|
cogl_path_line_to (path_a, BLOCK_SIZE, BLOCK_SIZE);
|
|
cogl_path_line_to (path_a, 0, BLOCK_SIZE);
|
|
cogl_path_close (path_a);
|
|
/* Add a clockwise sub path in the upper left quadrant */
|
|
cogl_path_move_to (path_a, 0, 0);
|
|
cogl_path_line_to (path_a, BLOCK_SIZE / 2, 0);
|
|
cogl_path_line_to (path_a, BLOCK_SIZE / 2, BLOCK_SIZE / 2);
|
|
cogl_path_line_to (path_a, 0, BLOCK_SIZE / 2);
|
|
cogl_path_close (path_a);
|
|
/* Add a counter-clockwise sub path in the upper right quadrant */
|
|
cogl_path_move_to (path_a, BLOCK_SIZE / 2, 0);
|
|
cogl_path_line_to (path_a, BLOCK_SIZE / 2, BLOCK_SIZE / 2);
|
|
cogl_path_line_to (path_a, BLOCK_SIZE, BLOCK_SIZE / 2);
|
|
cogl_path_line_to (path_a, BLOCK_SIZE, 0);
|
|
cogl_path_close (path_a);
|
|
/* Retain the path for the next test */
|
|
draw_path_at (path_a, white, 10, 0);
|
|
|
|
/* Draw the same path again with the other fill rule */
|
|
cogl_path_set_fill_rule (path_a, COGL_PATH_FILL_RULE_NON_ZERO);
|
|
draw_path_at (path_a, white, 11, 0);
|
|
|
|
cogl_object_unref (path_a);
|
|
}
|
|
|
|
static void
|
|
validate_result ()
|
|
{
|
|
check_block (0, 0, 0x8 /* bottom right */);
|
|
check_block (1, 0, 0xf /* all of them */);
|
|
check_block (2, 0, 0x8 /* bottom right */);
|
|
check_block (3, 0, 0x8 /* bottom right */);
|
|
check_block (4, 0, 0x9 /* top left and bottom right */);
|
|
check_block (5, 0, 0x8 /* bottom right */);
|
|
check_block (6, 0, 0xa /* bottom right and top right */);
|
|
check_block (7, 0, 0x9 /* top_left and bottom right */);
|
|
check_block (8, 0, 0xe /* all but top left */);
|
|
check_block (9, 0, 0x7 /* all but bottom right */);
|
|
check_block (10, 0, 0xc /* bottom two */);
|
|
check_block (11, 0, 0xd /* all but top right */);
|
|
}
|
|
|
|
void
|
|
test_path (void)
|
|
{
|
|
TestState state;
|
|
|
|
cogl_framebuffer_orthographic (test_fb,
|
|
0, 0,
|
|
cogl_framebuffer_get_width (test_fb),
|
|
cogl_framebuffer_get_height (test_fb),
|
|
-1,
|
|
100);
|
|
|
|
paint (&state);
|
|
validate_result ();
|
|
|
|
if (cogl_test_verbose ())
|
|
g_print ("OK\n");
|
|
}
|
|
|