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
65 lines
1.9 KiB
C
65 lines
1.9 KiB
C
#include <cogl/cogl.h>
|
|
|
|
#include <string.h>
|
|
|
|
#include "test-utils.h"
|
|
|
|
static void
|
|
paint (void)
|
|
{
|
|
CoglPipeline *pipeline = cogl_pipeline_new (test_ctx);
|
|
int width = cogl_framebuffer_get_width (test_fb);
|
|
int half_width = width / 2;
|
|
int height = cogl_framebuffer_get_height (test_fb);
|
|
CoglVertexP2 tri0_vertices[] = {
|
|
{ 0, 0 },
|
|
{ 0, height },
|
|
{ half_width, height },
|
|
};
|
|
CoglVertexP2C4 tri1_vertices[] = {
|
|
{ half_width, 0, 0x80, 0x80, 0x80, 0x80 },
|
|
{ half_width, height, 0x80, 0x80, 0x80, 0x80 },
|
|
{ width, height, 0x80, 0x80, 0x80, 0x80 },
|
|
};
|
|
CoglPrimitive *tri0;
|
|
CoglPrimitive *tri1;
|
|
|
|
cogl_framebuffer_clear4f (test_fb, COGL_BUFFER_BIT_COLOR, 0, 0, 0, 0);
|
|
|
|
tri0 = cogl_primitive_new_p2 (test_ctx, COGL_VERTICES_MODE_TRIANGLES,
|
|
3, tri0_vertices);
|
|
tri1 = cogl_primitive_new_p2c4 (test_ctx, COGL_VERTICES_MODE_TRIANGLES,
|
|
3, tri1_vertices);
|
|
|
|
/* Check that cogl correctly handles the case where we draw
|
|
* different primitives same pipeline and switch from using the
|
|
* opaque color associated with the pipeline and using a colour
|
|
* attribute with an alpha component which implies blending is
|
|
* required.
|
|
*
|
|
* If Cogl gets this wrong then then in all likelyhood the second
|
|
* primitive will be drawn with blending still disabled.
|
|
*/
|
|
|
|
cogl_primitive_draw (tri0, test_fb, pipeline);
|
|
cogl_primitive_draw (tri1, test_fb, pipeline);
|
|
|
|
test_utils_check_pixel_and_alpha (test_fb,
|
|
half_width + 5,
|
|
height - 5,
|
|
0x80808080);
|
|
}
|
|
|
|
void
|
|
test_blend (void)
|
|
{
|
|
cogl_framebuffer_orthographic (test_fb, 0, 0,
|
|
cogl_framebuffer_get_width (test_fb),
|
|
cogl_framebuffer_get_height (test_fb),
|
|
-1,
|
|
100);
|
|
|
|
paint ();
|
|
}
|
|
|