e9f721216e
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
123 lines
3.8 KiB
C
123 lines
3.8 KiB
C
#include <cogl/cogl.h>
|
|
|
|
#include "test-utils.h"
|
|
|
|
typedef CoglVertexP2C4 Vertex;
|
|
|
|
static void
|
|
setup_orthographic_modelview (void)
|
|
{
|
|
CoglMatrix matrix;
|
|
int fb_width = cogl_framebuffer_get_width (test_fb);
|
|
int fb_height = cogl_framebuffer_get_height (test_fb);
|
|
|
|
/* Set up a non-identity modelview matrix. When the journal is
|
|
* flushed it will usually flush the identity matrix. Using the
|
|
* non-default matrix ensures that we test that Cogl restores the
|
|
* matrix we asked for. The matrix sets up an orthographic transform
|
|
* in the modelview matrix */
|
|
|
|
cogl_matrix_init_identity (&matrix);
|
|
cogl_matrix_orthographic (&matrix,
|
|
0.0f, 0.0f, /* x_1 y_1 */
|
|
fb_width,
|
|
fb_height,
|
|
-1.0f, /* nearval */
|
|
1.0f /* farval */);
|
|
cogl_framebuffer_set_modelview_matrix (test_fb, &matrix);
|
|
}
|
|
|
|
static void
|
|
create_primitives (CoglPrimitive *primitives[2])
|
|
{
|
|
static const Vertex vertex_data[8] =
|
|
{
|
|
/* triangle strip 1 */
|
|
{ 0, 0, 255, 0, 0, 255 },
|
|
{ 0, 100, 255, 0, 0, 255 },
|
|
{ 100, 0, 255, 0, 0, 255 },
|
|
{ 100, 100, 255, 0, 0, 255 },
|
|
/* triangle strip 2 */
|
|
{ 200, 0, 0, 0, 255, 255 },
|
|
{ 200, 100, 0, 0, 255, 255 },
|
|
{ 300, 0, 0, 0, 255, 255 },
|
|
{ 300, 100, 0, 0, 255, 255 },
|
|
};
|
|
|
|
primitives[0] = cogl_primitive_new_p2c4 (test_ctx,
|
|
COGL_VERTICES_MODE_TRIANGLE_STRIP,
|
|
G_N_ELEMENTS (vertex_data),
|
|
vertex_data);
|
|
cogl_primitive_set_n_vertices (primitives[0], 4);
|
|
|
|
primitives[1] = cogl_primitive_copy (primitives[0]);
|
|
cogl_primitive_set_first_vertex (primitives[1], 4);
|
|
cogl_primitive_set_n_vertices (primitives[1], 4);
|
|
}
|
|
|
|
static CoglPipeline *
|
|
create_pipeline (void)
|
|
{
|
|
CoglPipeline *pipeline = cogl_pipeline_new (test_ctx);
|
|
|
|
cogl_pipeline_set_color4ub (pipeline, 0, 255, 0, 255);
|
|
|
|
return pipeline;
|
|
}
|
|
|
|
void
|
|
test_primitive_and_journal (void)
|
|
{
|
|
CoglPrimitive *primitives[2];
|
|
CoglPipeline *pipeline;
|
|
|
|
setup_orthographic_modelview ();
|
|
create_primitives (primitives);
|
|
pipeline = create_pipeline ();
|
|
|
|
/* Set a clip to clip all three rectangles to just the bottom half.
|
|
* The journal flushes its own clip state so this verifies that the
|
|
* clip state is correctly restored for the second primitive. */
|
|
cogl_framebuffer_push_rectangle_clip (test_fb,
|
|
0, 50, 300, 100);
|
|
|
|
cogl_primitive_draw (primitives[0], test_fb, pipeline);
|
|
|
|
/* Draw a rectangle using the journal in-between the two primitives.
|
|
* This should test that the journal gets flushed correctly and that
|
|
* the modelview matrix is restored. Half of the rectangle should be
|
|
* overriden by the second primitive */
|
|
cogl_framebuffer_draw_rectangle (test_fb,
|
|
pipeline,
|
|
100, 0, /* x1/y1 */
|
|
300, 100 /* x2/y2 */);
|
|
|
|
cogl_primitive_draw (primitives[1], test_fb, pipeline);
|
|
|
|
/* Check the three rectangles */
|
|
test_utils_check_region (test_fb,
|
|
1, 51,
|
|
98, 48,
|
|
0xff0000ff);
|
|
test_utils_check_region (test_fb,
|
|
101, 51,
|
|
98, 48,
|
|
0x00ff00ff);
|
|
test_utils_check_region (test_fb,
|
|
201, 51,
|
|
98, 48,
|
|
0x0000ffff);
|
|
|
|
/* Check that the top half of all of the rectangles was clipped */
|
|
test_utils_check_region (test_fb,
|
|
1, 1,
|
|
298, 48,
|
|
0x000000ff);
|
|
|
|
cogl_framebuffer_pop_clip (test_fb);
|
|
|
|
if (cogl_test_verbose ())
|
|
g_print ("OK\n");
|
|
}
|
|
|